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

Author: prathi-wind

.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.

.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

@@ -329,6 +329,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()
 
@@ -444,7 +451,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)

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

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

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

@@ -300,6 +300,7 @@ contains
                         end if
                     end do
 
+                    ! TODO :: This entire if/else tree can be simplified by just calling arrays by idx index
                     if (idx == 1) then
                         levelset%sf(i, j, 0, ib_patch_id) = side_dists(1)
                         if (f_approx_equal(side_dists(1), 0._wp)) then

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

@@ -318,6 +318,11 @@ module m_derived_types
 
         real(wp) :: model_threshold !<
         !! Threshold to turn on smoothen STL patch.
+
+        !! Patch conditions for moving imersed boundaries
+        integer :: moving_ibm ! 0 for no moving, 1 for moving, 2 for moving on forced path
+        real(wp), dimension(1:3) :: vel
+
     end type ib_patch_parameters
 
     !> Derived type annexing the physical parameters (PP) of the fluids. These