Merge branch 'master' into cray_workaround_removal

MFlowCode · Nov 7, 2024 · 0246cb0 · 0246cb0
2 parents eda5bb2 + 39e410a
commit 0246cb0
Show file tree

Hide file tree

Showing 43 changed files with 342 additions and 306 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,7 +127,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         add_compile_options(
-            -Wall 
+            -Wall
             -fcheck=all,no-array-temps
             -fbacktrace
             -fimplicit-none
@@ -142,7 +142,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
         add_compile_options(
             $<$<COMPILE_LANGUAGE:Fortran>:-fallow-invalid-boz>
             $<$<COMPILE_LANGUAGE:Fortran>:-fallow-argument-mismatch>
-            $<$<COMPILE_LANGUAGE:Fortran>:-fcheck=bounds>            
+            $<$<COMPILE_LANGUAGE:Fortran>:-fcheck=bounds>
         )
     endif()
 elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
@@ -155,7 +155,7 @@ elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
     )
 
     add_link_options("SHELL:-hkeepfiles")
-    
+
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         add_compile_options(
                 "SHELL:-h acc_model=auto_async_none"
@@ -197,7 +197,7 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_
 
     if (DEFINED ENV{MFC_CUDA_CC})
         string(REGEX MATCHALL "[0-9]+" MFC_CUDA_CC $ENV{MFC_CUDA_CC})
-        message(STATUS "Found $MFC_CUDA_CC specified. GPU code will be generated for ${MFC_CUDA_CC}.")
+        message(STATUS "Found $MFC_CUDA_CC specified. GPU code will be generated for compute capability(ies) ${MFC_CUDA_CC}.")
     endif()
 endif()
 
@@ -231,7 +231,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Release")
 	    else()
             message(STATUS "IPO / LTO is NOT available")
         endif()
-    endif() 
+    endif()
 endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -295,7 +295,7 @@ macro(HANDLE_SOURCES target useCommon)
 
     string(TOUPPER ${target} ${target}_UPPER)
 
-    # Gather: 
+    # Gather:
     # *          src/[<target>,(common)]/*.f90
     # * (if any) <build>/modules/<target>/*.f90
     file(GLOB ${target}_F90s CONFIGURE_DEPENDS "${${target}_DIR}/*.f90"
@@ -388,7 +388,7 @@ function(MFC_SETUP_TARGET)
     # A little hacky, but it *is* an edge-case for *one* compiler.
     if (NVHPC_USE_TWO_PASS_IPO)
         add_library(${ARGS_TARGET}_lib OBJECT ${ARGS_SOURCES})
-        target_compile_options(${ARGS_TARGET}_lib PRIVATE 
+        target_compile_options(${ARGS_TARGET}_lib PRIVATE
 		    $<$<COMPILE_LANGUAGE:Fortran>:-Mextract=lib:${ARGS_TARGET}_lib>
 	        $<$<COMPILE_LANGUAGE:Fortran>:-Minline>
     	)

diff --git a/benchmarks/viscous_weno5_sgb_acoustic/case.py b/benchmarks/viscous_weno5_sgb_acoustic/case.py
@@ -82,7 +82,7 @@
 cact    = 1475.
 t0      = x0/c0
 
-nbubbles = 1 
+nbubbles = 1
 myr0     = R0ref
 
 cfl     = 0.01
@@ -98,7 +98,7 @@
     # Logistics ================================================
     'run_time_info'                : 'F',
     # ==========================================================
-    
+
     # Computational Domain Parameters ==========================
     'x_domain%beg'                 : -10.E-03/x0,
     'x_domain%end'                 :  10.E-03/x0,
@@ -127,7 +127,7 @@
     'time_stepper'                 : 3,
     'weno_order'                   : 5,
     'weno_eps'                     : 1.E-16,
-    'weno_Re_flux'                 : 'F',  
+    'weno_Re_flux'                 : 'F',
     'weno_avg'                     : 'F',
     'mapped_weno'                  : 'T',
     'null_weights'                 : 'F',
@@ -141,15 +141,16 @@
     'bc_y%end'                     : -3,
     'bc_z%beg'                     : -3,
     'bc_z%end'                     : -3,
+    'viscous'                      : 'T',
     # ==========================================================
-    
+
     # Formatted Database Files Structure Parameters ============
     'format'                       : 1,
     'precision'                    : 2,
     'prim_vars_wrt'                :'T',
     'parallel_io'                  :'T',
-    # ==========================================================                                                   
-    
+    # ==========================================================
+
     # Patch 1 _ Background =====================================
     'patch_icpp(1)%geometry'       : 9,
     'patch_icpp(1)%x_centroid'     : 0.,
@@ -167,7 +168,7 @@
     'patch_icpp(1)%r0'             : 1.,
     'patch_icpp(1)%v0'             : 0.0E+00,
     # ==========================================================
-    
+
     # Patch 2 Screen ===========================================
     'patch_icpp(2)%geometry'       : 9,
     'patch_icpp(2)%x_centroid'     : 0.,
@@ -186,7 +187,7 @@
     'patch_icpp(2)%r0'             : 1.,
     'patch_icpp(2)%v0'             : 0.0E+00,
     # ==========================================================
-    
+
     # Fluids Physical Parameters ===============================
     # Surrounding liquid
     'fluid_pp(1)%gamma'            : 1.E+00/(n_tait-1.E+00),
@@ -208,12 +209,12 @@
     'fluid_pp(2)%mu_v'             : mu_n,
     'fluid_pp(2)%k_v'              : k_n,
     # ==========================================================
-    
+
     # Non-polytropic gas compression model AND/OR Tait EOS =====
     'pref'                         : p0,
     'rhoref'                       : rho0,
     # ==========================================================
-    
+
     # Bubbles ==================================================
     'bubbles'                      : 'T',
     'bubble_model'                 : 3,
@@ -227,7 +228,7 @@
     'Web'                          : We,
     'Re_inv'                       : Re_inv,
     # ==========================================================
-    
+
     # Acoustic source ==========================================
     'acoustic_source'              : 'T',
     'num_source'                   : 1,