diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b533e6f40..6b10d9cd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,6 @@ jobs: working-directory: ${{ env.NEKRS_EXAMPLES }}/ethier run: ${{ env.NEKRS_HOME }}/bin/nrsmpi ethier 2 8 - lowMach: needs: install runs-on: ubuntu-18.04 diff --git a/examples/ethier/ci.inc b/examples/ethier/ci.inc index 3fec51317..78359f368 100644 --- a/examples/ethier/ci.inc +++ b/examples/ethier/ci.inc @@ -28,8 +28,13 @@ void ciSetup(MPI_Comm comm, setupAide &options) options.setArgs("VELOCITY BLOCK SOLVER", "FALSE"); options.setArgs("SCALAR INITIAL GUESS","PREVIOUS"); options.setArgs("VELOCITY INITIAL GUESS","PREVIOUS"); + options.setArgs("ADVECTION TYPE", "CONVECTIVE+CUBATURE"); + if (ciMode == 1) { + options.setArgs("ADVECTION TYPE", "CONVECTIVE"); + } if (ciMode == 2) { + options.setArgs("ADVECTION TYPE", "CONVECTIVE"); options.setArgs("VELOCITY BLOCK SOLVER", "TRUE"); options.setArgs("SUBCYCLING STEPS", std::string("1")); options.setArgs("PRESSURE INITIAL GUESS", "PROJECTION-ACONJ"); @@ -69,9 +74,18 @@ void ciSetup(MPI_Comm comm, setupAide &options) options.setArgs("VARIABLE DT", "TRUE"); options.setArgs("TARGET CFL", "0.5"); } + if (ciMode == 9) { + options.setArgs("VELOCITY BLOCK SOLVER", "TRUE"); + options.setArgs("SUBCYCLING STEPS", std::string("1")); + options.setArgs("PRESSURE INITIAL GUESS", "PROJECTION-ACONJ"); + } + if (ciMode == 10) { + options.setArgs("ADVECTION TYPE", "CONVECTIVE"); + options.setArgs("VELOCITY BLOCK SOLVER", "TRUE"); + options.setArgs("PRESSURE INITIAL GUESS", "PROJECTION-ACONJ"); + } options.setArgs("TIME INTEGRATOR", "TOMBO3"); - options.setArgs("ADVECTION TYPE", "CONVECTIVE+CUBATURE"); options.setArgs("VELOCITY SOLVER TOLERANCE", std::string("1e-12")); options.setArgs("PRESSURE SOLVER TOLERANCE", std::string("1e-10")); options.setArgs("SCALAR00 SOLVER TOLERANCE", std::string("1e-12")); @@ -223,18 +237,18 @@ void ciTestErrors(nrs_t *nrs, dfloat time, int tstep) switch (ciMode) { case 1 : velIterErr = abs(NiterU - 10); - s1Err = abs((err[2] - 5.25E-12)/err[2]); - s2Err = abs((err[3] - 6.09E-12)/err[3]); - pIterErr = abs(NiterP - 2); + s1Err = abs((err[2] - 4.76E-12)/err[2]); + s2Err = abs((err[3] - 5.54E-12)/err[3]); + pIterErr = abs(NiterP - 4); vxErr = abs((err[0] - 2.78E-10)/err[0]); prErr = abs((err[1] - 7.02E-010)/err[1]); s01IterErr = abs(NiterS01 - 10); s02IterErr = abs(NiterS02 - 10); break; case 2 : velIterErr = abs(NiterU - 10); - s1Err = abs((err[2] - 6.49E-12)/err[2]); - s2Err = abs((err[3] - 7.28E-12)/err[3]); - pIterErr = abs(NiterP - 2); + s1Err = abs((err[2] - 6.11E-12)/err[2]); + s2Err = abs((err[3] - 6.84E-12)/err[3]); + pIterErr = abs(NiterP - 1); vxErr = abs((err[0] - 2.78E-10)/err[0]); prErr = abs((err[1] - 7.11E-10)/err[1]); s01IterErr = abs(NiterS01 - 10); @@ -300,9 +314,9 @@ void ciTestErrors(nrs_t *nrs, dfloat time, int tstep) } - if (ciMode == 2){ + if (ciMode == 4){ dfloat memoryUsage = platform->device.memoryAllocated()/1e9; - const dfloat expectedMemoryUsage = 0.0430849; + const dfloat expectedMemoryUsage = 0.0498817; if(memoryUsage > 1.01 * expectedMemoryUsage && platform->comm.mpiCommSize == 2) { if(platform->comm.mpiRank == 0){