Additional commits based on code review, will be merged into original…

… comit b06b41d and reworded once PR is approved
ufs-community · Oct 21, 2019 · ce41b0b · ce41b0b
1 parent b06b41d
commit ce41b0b
Show file tree

Hide file tree

Showing 13 changed files with 127,070 additions and 13,053 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,17 +1,19 @@
 [submodule "FV3"]
 	path = FV3
-	url = https://github.com/NOAA-EMC/fv3atm
-	branch = develop
+	url = https://github.com/climbfuji/fv3atm
+	branch = update_fv3atm_with_changes_from_gmtb_develop_as_of_20191016
 [submodule "NEMS"]
 	path = NEMS
 	url = https://github.com/NOAA-EMC/NEMS
 	branch = develop
 [submodule "ccpp/framework"]
 	path = ccpp/framework
-	url = https://github.com/NCAR/ccpp-framework
+	url = https://github.com/climbfuji/ccpp-framework
+	branch = update_master_from_gmtb_develop_20191016
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
+	url = https://github.com/climbfuji/ccpp-physics
+	branch = update_master_from_gmtb_develop_20191016
 [submodule "FMS"]
 	path = FMS
 	url = https://github.com/NOAA-EMC/FMS

diff --git a/FMS b/FMS
diff --git a/FV3 b/FV3
diff --git a/ccpp/build_ccpp.sh b/ccpp/build_ccpp.sh
@@ -7,7 +7,8 @@ set -eu
 VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \
                  hera.intel \
                  cheyenne.intel cheyenne.intel-impi cheyenne.gnu cheyenne.pgi endeavor.intel \
-                 stampede.intel supermuc_phase2.intel macosx.gnu linux.gnu )
+                 stampede.intel supermuc_phase2.intel macosx.gnu \
+                 linux.intel linux.gnu linux.pgi )
 
 ###################################################################################################
 

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/set_compilers.sh b/ccpp/set_compilers.sh
@@ -92,12 +92,18 @@ case "$MACHINE_ID" in
         macosx.gnu)
             # set in generic modulefile
             ;;
+        linux.intel)
+            # set in generic modulefile
+            ;;
         linux.gnu)
             # set in generic modulefile
             ;;
+        linux.pgi)
+            # set in generic modulefile
+            ;;
         *)
             echo "ERROR: MACHINE_ID ${MACHINE_ID} not configured in set_compilers.sh"
             exit 1 
 esac
 
-echo "Compilers set for ${MACHINE_ID}."
+echo "Compilers set for ${MACHINE_ID}."
diff --git a/tests/Compile_cheyenne.gnu.log b/tests/Compile_cheyenne.gnu.log
diff --git a/tests/Compile_cheyenne.intel.log b/tests/Compile_cheyenne.intel.log
diff --git a/tests/Compile_cheyenne.pgi.log b/tests/Compile_cheyenne.pgi.log
+4 −3		scripts/ccpp_prebuild.py
+2 −2		scripts/common.py
+4 −3		scripts/metadata2html.py
+8 −16		physics/sfc_drv_ruc.F90
+5 −32		physics/sfc_drv_ruc.meta