CCPP framework (metadata parser) update, and update several units in …

…CCPP metadata in fv3atm and ccpp-physics, use Python 3.6+ (#907) With the metadata parser update in NCAR/ccpp-framework#415, a stricter checking of units will be enforced. This includes the replacement of "convenience units" such as log(Pa) with 1. Corresponding changes are made in ccpp-physics and fv3atm. The ccpp-framework update requires Python 3.6 or newer - load Python 3.7.9 modules on Cheyenne, all other platforms are already using 3.6 or newer.
ufs-community · Nov 24, 2021 · 57288b9 · 57288b9
1 parent 919ca0a
commit 57288b9
Show file tree

Hide file tree

Showing 15 changed files with 1,659 additions and 1,659 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,7 +129,7 @@ find_package(sp REQUIRED)
 find_package(w3nco REQUIRED)
 
 # Configure Python
-find_package(Python 3 REQUIRED COMPONENTS Interpreter)
+find_package(Python 3.6 REQUIRED COMPONENTS Interpreter)
 message("Found Python: ${Python_EXECUTABLE}")
 
 ###############################################################################

diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
@@ -7,6 +7,7 @@ proc ModulesHelp {} {
 module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
 module load cmake/3.18.2
+module load python/3.7.9
 
 # load programming environment
 module load ncarenv/1.3

diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug
@@ -7,6 +7,7 @@ proc ModulesHelp {} {
 module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
 module load cmake/3.18.2
+module load python/3.7.9
 
 # load programming environment
 module load ncarenv/1.3

diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel
@@ -7,6 +7,7 @@ proc ModulesHelp {} {
 module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
 module load cmake/3.18.2
+module load python/3.7.9
 
 # load programming environment
 module load ncarenv/1.3

diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
@@ -7,6 +7,7 @@ proc ModulesHelp {} {
 module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
 module load cmake/3.18.2
+module load python/3.7.9
 
 # load programming environment
 module load ncarenv/1.3

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
+1 −1		ccpp/data/CCPP_typedefs.meta
+16 −18		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/framework
+1 −1		ccpp/physics