ufs-community · junwang-noaa · Mar 11, 2021 · Dec 22, 2020 · Jan 5, 2021 · Jan 5, 2021
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -3,8 +3,7 @@ name: Pull request tests
 on:
   push:
     branches: ['develop']
-  pull_request_review:
-    types: [submitted]
+  pull_request:
     branches: ['develop']
 
 jobs:
@@ -45,7 +44,6 @@ jobs:
   build:
     name: Build (${{ matrix.bld_set }})
     needs: setup
-    if: github.event_name == 'push' || (github.event.review.state == 'approved' && toJson(github.event.pull_request.requested_reviewers) == '[]')
     runs-on: ubuntu-20.04
 
     strategy:

diff --git a/.github/workflows/manage_workflows.yml b/.github/workflows/manage_workflows.yml
@@ -15,22 +15,23 @@ jobs:
       - name: Checkout codes
         uses: actions/checkout@v2
 
-      - name: Check if skip-ci is requested
+      - name: Check if run-ci is requested
         run: |
           sleep 40
           cd ${GITHUB_WORKSPACE}/tests/ci
           repo="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/actions/runs"
           tr_id=$(cat ${GITHUB_EVENT_PATH} | ./json_helper.py get_trigger_id)
           tr_br=$(cat ${GITHUB_EVENT_PATH} | ./json_helper.py get_trigger_br)
-          check=$(cat ${GITHUB_EVENT_PATH} | ./json_helper.py check_skip)
+          check=$(cat ${GITHUB_EVENT_PATH} | ./json_helper.py check_run)
           echo "TRIGGER_ID=${tr_id}" >> $GITHUB_ENV
           echo "TRIGGER_BR=${tr_br}" >> $GITHUB_ENV
-          echo "skip-ci: ${check}"
-          if [[ $check == yes ]]; then
-            echo "skip-ci is requested"
+          echo "run-ci: ${check}"
+          if [[ $check == no ]]; then
+            echo "run-ci is not requested"
             echo "CURR_JOB=cancelled" >> $GITHUB_ENV
             curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github.v3+json" ${repo}/$tr_id/cancel
           else
+            echo "run-ci is requested"
             echo "CURR_JOB=running" >> $GITHUB_ENV
           fi
 

diff --git a/FV3 b/FV3
diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3
@@ -42,4 +42,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/cheyenne.gnu/fv3_debug b/modulefiles/cheyenne.gnu/fv3_debug
@@ -42,4 +42,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
@@ -42,4 +42,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/cheyenne.intel/fv3_debug b/modulefiles/cheyenne.intel/fv3_debug
@@ -42,4 +42,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3
@@ -44,7 +44,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
 
 # Needed at runtime:
 module load alps
diff --git a/modulefiles/gaea.intel/fv3_debug b/modulefiles/gaea.intel/fv3_debug
@@ -44,7 +44,7 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
 
 # Needed at runtime:
 module load alps
diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/jet.intel/fv3_debug b/modulefiles/jet.intel/fv3_debug
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/orion.intel/fv3_debug
@@ -39,4 +39,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -53,7 +53,7 @@ module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 
-module load upp/10.0.0
+module load upp/10.0.4
 
 ## WCOSS Cray execution prereqs:
 module load rca

diff --git a/modulefiles/wcoss_cray/fv3_debug b/modulefiles/wcoss_cray/fv3_debug
@@ -53,7 +53,7 @@ module load gfsio/1.4.1
 module load sfcio/1.4.1
 module load sigio/2.3.2
 
-module load upp/10.0.0
+module load upp/10.0.4
 
 ## WCOSS Cray execution prereqs:
 module load rca

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -41,4 +41,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/wcoss_dell_p3/fv3_debug
@@ -41,4 +41,4 @@ module load nemsio/2.5.2
 module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
-module load upp/10.0.0
+module load upp/10.0.4
+83 −0		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+2 −2		io/CMakeLists.txt
+78 −0		io/inline_post.F90
+58 −0		io/inline_post_stub.F90
+66 −38		io/module_wrt_grid_comp.F90
+11 −4		io/post_gfs.F90
+2,930 −0		io/post_regional.F90
+110 −110		module_fcst_grid_comp.F90