CCPP metadata bugfixes, FMS 2021.03 updates in FV3, bug fix for IAU, …

…bug fix for loading yaml module (#782) This PR has code changes in fv3atm and ccpp-physics for CCPP metadata bugfixes and FV3 FMS updates + IAU bug fixes. It also includes the bug fix to load module gftl-shared, yadyaml and mapl on hera only. Co-authored-by: Wen Meng <[email protected]>
ufs-community · Sep 10, 2021 · 29fa453 · 29fa453
1 parent 4a2a127
commit 29fa453
Show file tree

Hide file tree

Showing 14 changed files with 1,959 additions and 1,869 deletions.
diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -19,6 +19,6 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.8
 
-module load gftl-shared/v1.3.0
-module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
+#module load gftl-shared/v1.3.0
+#module load yafyaml/v0.5.1
+#module load mapl/v2.7.3-esmf820bs14
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -19,6 +19,6 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.8
 
-module load gftl-shared/v1.3.0
-module load yafyaml/v0.5.1
-module load mapl/v2.7.3-esmf820bs14
+#module load gftl-shared/v1.3.0
+#module load yafyaml/v0.5.1
+#module load mapl/v2.7.3-esmf820bs14
diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel
@@ -25,6 +25,9 @@ module load ufs_common
 
 module unload fms
 module load fms/2021.03-avx
+module load gftl-shared/v1.3.0
+module load yafyaml/v0.5.1
+module load mapl/v2.7.3-esmf820bs14
 
 setenv CC mpiicc
 setenv CXX mpiicpc

diff --git a/modulefiles/ufs_hera.intel_debug b/modulefiles/ufs_hera.intel_debug
@@ -23,6 +23,10 @@ module load hpc-impi/2018.0.4
 
 module load ufs_common_debug
 
+module load gftl-shared/v1.3.0
+module load yafyaml/v0.5.1
+module load mapl/v2.7.3-esmf820bs14
+
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
+2 −16		atmos_model.F90
+4 −4		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics
+19 −23		module_fcst_grid_comp.F90