ufs-community · DusanJovic-NOAA · Apr 30, 2021 · Apr 9, 2021 · Apr 9, 2021 · Apr 9, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/climbfuji/fv3atm
+  branch = capgen_fixes_assumed_sizes
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

diff --git a/FV3 b/FV3
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_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/ci/repo_check.sh b/tests/ci/repo_check.sh
@@ -80,7 +80,7 @@ done
 cd ${GITHUB_WORKSPACE}
 git remote add upstream ${base[repo]}
 git fetch -q upstream ${base[branch]}
-common=$(git merge-base upstream/${base[branch]} @)
+common=$(git merge-base ${base[sha]} @)
 if [[ $common != ${base[sha]} ]]; then
   comment="* ufs-weather-model **NOT** up to date\n"
 fi
@@ -89,7 +89,7 @@ for submodule in $submodules; do
   eval cd ${GITHUB_WORKSPACE}/'${'$submodule'[dir]}'
   eval git remote add upstream '${'$submodule'[repo]}'
   eval git fetch -q upstream '${'$submodule'[branch]}'
-  common=$(eval git merge-base upstream/'${'$submodule'[branch]}' @)
+  common=$(eval git merge-base '${'$submodule'[sha]}' @)
   if (eval test $common != '${'$submodule'[sha]}'); then
     comment+="* $submodule **NOT** up to date\n"
   fi

diff --git a/tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3 b/tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3
@@ -3,7 +3,7 @@
 #BSUB -oo out
 #BSUB -eo err
 #BSUB -J @[JBNME]
-#BSUB -W 00:50
+#BSUB -W 01:00
 #BSUB -q @[QUEUE]
 #BSUB -P GFS-DEV
 #BSUB -n 1

diff --git a/tests/rt.conf b/tests/rt.conf
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -315,7 +315,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   PARTITION=
   dprefix=/glade/scratch
   DISKNM=/glade/p/ral/jntp/GMTB/ufs-weather-model/RT
-  STMP=/glade/work
+  STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=pbs
   cp fv3_conf/fv3_qsub.IN_cheyenne fv3_conf/fv3_qsub.IN
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210428
+BL_DATE=20210430
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
+4 −2		.gitmodules
+7 −0		ccpp/CMakeLists.txt
+0 −7		ccpp/config/ccpp_prebuild_config.py
+1 −1		ccpp/data/GFS_typedefs.meta
+1 −1		ccpp/physics