Merge remote-tracking branch 'upstream/master' into ImprovedELBubblesIO

Author: wilfonba

.github/workflows/frontier/submit.sh

@@ -33,7 +33,7 @@ sbatch <<EOT
 #SBATCH -A CFD154                  # charge account
 #SBATCH -N 1                       # Number of nodes required
 $sbatch_device_opts
-#SBATCH -t 04:59:00                # Duration of the job (Ex: 15 mins)
+#SBATCH -t 05:59:00                # Duration of the job (Ex: 15 mins)
 #SBATCH -o$job_slug.out            # Combined output and error messages file
 #SBATCH -p extended                # Extended partition for shorter queues
 #SBATCH -W                         # Do not exit until the submitted job terminates.

.typos.toml

@@ -19,7 +19,7 @@ strang = "strang"
 Strang = "Strang"
 TKE = "TKE"
 HSA = "HSA"
-INFP = "INFP"
+infp = "infp"
 
 [files]
 extend-exclude = ["docs/documentation/references*", "tests/", "toolchain/cce_simulation_workgroup_256.sh"]

.vscode/settings.json

@@ -49,7 +49,7 @@
     // Enable ONLY fortls language server
     "fortran.enableLanguageServer": true,
     "fortran.languageServer": "fortls",
-    "fortran.fortls.disabled": false,
+    "fortran.fortls.disabled": true,
     "fortran.fortls.path": "fortls",
 
     // Try to disable any built-in language features

CMakeLists.txt

@@ -328,6 +328,13 @@ macro(HANDLE_SOURCES target useCommon)
                                                "${CMAKE_BINARY_DIR}/modules/${target}/*.fpp")
     if (${useCommon})
         file(GLOB common_FPPs CONFIGURE_DEPENDS "${common_DIR}/*.fpp")
+
+        # If we're building post_process, exclude m_compute_levelset.fpp
+        if("${target}" STREQUAL "post_process")
+            list(FILTER common_FPPs EXCLUDE REGEX ".*/m_compute_levelset\.fpp$")
+            list(FILTER common_FPPs EXCLUDE REGEX ".*/m_ib_patches\.fpp$")
+        endif()
+
         list(APPEND ${target}_FPPs ${common_FPPs})
     endif()
 
@@ -443,7 +450,7 @@ function(MFC_SETUP_TARGET)
 
         if (ARGS_SILO)
             find_package(SILO REQUIRED)
-            target_link_libraries(${a_target} PRIVATE SILO::SILO)
+            target_link_libraries(${a_target} PRIVATE SILO::SILO stdc++)
         endif()
 
         if (ARGS_HDF5)

examples/1D_inert_shocktube/case.py

@@ -70,8 +70,8 @@
     "mapped_weno": "T",
     "mp_weno": "T",
     "riemann_solver": 2,
-    "wave_speeds": 2,
-    "avg_state": 1,
+    "wave_speeds": 1,
+    "avg_state": 2,
     "bc_x%beg": -2,
     "bc_x%end": -3,
     # Chemistry

src/common/include/1dHardcodedIC.fpp

@@ -0,0 +1,57 @@
+#:def Hardcoded1DVariables()
+    ! Place any declaration of intermediate variables here
+    real(wp) :: x_mid_diffu, width_sq, profile_shape, temp, molar_mass_inv, y1, y2, y3, y4
+#:enddef
+
+#:def Hardcoded1D()
+    select case (patch_icpp(patch_id)%hcid)
+    case (170)
+        ! This hardcoded case can be used to start a simulation with initial conditions given from a known 1D profile (e.g. Cantera, SDtoolbox)
+        @: HardcodedReadValues()
+
+    case (180)
+        ! This is patch is hard-coded for test suite optimization used in the
+        ! 1D_shuoser cases: "patch_icpp(2)%alpha_rho(1)": "1 + 0.2*sin(5*x)"
+        if (patch_id == 2) then
+            q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.2*sin(5*x_cc(i))
+        end if
+
+    case (181)
+        ! This is patch is hard-coded for test suite optimization used in the
+        ! 1D_titarevtorro cases: "patch_icpp(2)%alpha_rho(1)": "1 + 0.1*sin(20*x*pi)"
+        q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.1*sin(20*x_cc(i)*pi)
+
+    case (182)
+        ! This patch is a hard-coded for test suite optimization (multiple component diffusion)
+        x_mid_diffu = 0.05_wp/2.0_wp
+        width_sq = (2.5_wp*10.0_wp**(-3.0_wp))**2
+        profile_shape = 1.0_wp - 0.5_wp*exp(-(x_cc(i) - x_mid_diffu)**2/width_sq)
+        q_prim_vf(momxb)%sf(i, 0, 0) = 0.0_wp
+        q_prim_vf(E_idx)%sf(i, 0, 0) = 1.01325_wp*(10.0_wp)**5
+        q_prim_vf(advxb)%sf(i, 0, 0) = 1.0_wp
+
+        y1 = (0.195_wp - 0.142_wp)*profile_shape + 0.142_wp
+        y2 = (0.0_wp - 0.1_wp)*profile_shape + 0.1_wp
+        y3 = (0.214_wp - 0.0_wp)*profile_shape + 0.0_wp
+        y4 = (0.591_wp - 0.758_wp)*profile_shape + 0.758_wp
+
+        q_prim_vf(chemxb)%sf(i, 0, 0) = y1
+        q_prim_vf(chemxb + 1)%sf(i, 0, 0) = y2
+        q_prim_vf(chemxb + 2)%sf(i, 0, 0) = y3
+        q_prim_vf(chemxb + 3)%sf(i, 0, 0) = y4
+
+        temp = (320.0_wp - 1350.0_wp)*profile_shape + 1350.0_wp
+
+        molar_mass_inv = y1/31.998_wp + &
+                         y2/18.01508_wp + &
+                         y3/16.04256_wp + &
+                         y4/28.0134_wp
+
+        q_prim_vf(contxb)%sf(i, 0, 0) = 1.01325_wp*(10.0_wp)**5/(temp*8.3144626_wp*1000.0_wp*molar_mass_inv)
+
+    case default
+        call s_int_to_str(patch_id, iStr)
+        call s_mpi_abort("Invalid hcid specified for patch "//trim(iStr))
+    end select
+
+#:enddef

src/pre_process/include/2dHardcodedIC.fpp renamed to src/common/include/2dHardcodedIC.fpp

@@ -4,4 +4,5 @@
 
 ! For pre-process.
 #:def analytical()
+
 #:enddef