Sixth reconciliation PR from production/RRFS.v1 + FV3 CCPP: wet() bug…

… fix and workaround for bad tsfco ufs-community#2572 (ufs-community#2529) * UFSWM - Provides a set of changes changes needed to take advantage of FMS parallel IO changes; adds a new diagnostic, instantaneous downward shortwave flux at the surface assuming clear-sky conditions * FV3 - Provides a set of changes changes needed to take advantage of FMS parallel IO changes; adds a new diagnostic, instantaneous downward shortwave flux at the surface assuming clear-sky conditions * ccpp-physics - adds a new diagnostic, instantaneous downward shortwave flux at the surface assuming clear-sky conditions * ccpp-physics - wet() bug fix and workaround for bad tsfco * atmos_cubed_sphere - Provides a set of changes changes needed to take advantage of FMS parallel IO changes --------- Co-authored-by: Samuel Trahan <samuel.trahan@noaa.gov>
LarissaReames-NOAA · Feb 12, 2025 · 38da98c · 38da98c
1 parent d57779f
commit 38da98c
Show file tree

Hide file tree

Showing 10 changed files with 2,393 additions and 2,552 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -94,6 +94,10 @@ else
   fi
 fi
 
+if [[ ${MACHINE_ID} == wcoss2 ]] || [[ ${MACHINE_ID} == acorn ]]; then
+    CMAKE_FLAGS+=" -DENABLE_PARALLELRESTART=ON"
+fi
+
 # Check if suites argument is provided or not
 set +ex
 SUITES=$(grep -Po "\-DCCPP_SUITES=\K[^ ]*" <<< "${MAKE_OPT}")

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_derecho.log b/tests/logs/RegressionTests_derecho.log
diff --git a/tests/logs/RegressionTests_gaeac5.log b/tests/logs/RegressionTests_gaeac5.log
diff --git a/tests/logs/RegressionTests_gaeac6.log b/tests/logs/RegressionTests_gaeac6.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
+8 −0		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+6 −0		ccpp/data/GFS_typedefs.F90
+14 −0		ccpp/data/GFS_typedefs.meta
+12 −0		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+42 −1		io/fv3atm_restart_io.F90