UFS/dev PR#6

.github/workflows/build_test.yml

@@ -105,12 +105,12 @@ jobs:
         sudo systemctl restart docker
         sleep 10
         cd tests/ci && ./ci.sh -n ${{ matrix.name }} -b ${{ matrix.case }}
+        sudo docker image ls
 
-    - name: Free up disk space
-      run: |
-        sudo docker rmi $(sudo docker image ls | grep -E -m1 '<none>' | awk '{ print $3 }')
-        sudo docker rmi $(sudo docker image ls | awk '/ubuntu-hpc/ { print $3 }')
-
+    #- name: Free up disk space
+    #  run: |
+    #    sudo    docker images --no-trunc --all --quiet --filter="dangling=true" | sudo xargs --no-run-if-empty docker rmi  
+
     - uses: actions/upload-artifact@v2
       with:
         name: ${{ matrix.bld_set }}.artifact
@@ -174,14 +174,14 @@ jobs:
         cd ${{ github.workspace }}/tests/ci
         ./ci.sh -n ${{ matrix.name }} -r ${{ matrix.case }}
 
-    - uses: actions/upload-artifact@v2
-      if: ${{ always() }}
-      with:
-        name: memory_stat_${{ matrix.test_set }}
-        path: memory_stat
-
-    - name: Clean up
-      if: ${{ always() }}
-      run: |
-        docker stop my-container && docker rm my-container
-        docker volume rm DataVolume
+    #- uses: actions/upload-artifact@v2
+    #  if: ${{ always() }}
+    #  with:
+    #    name: memory_stat_${{ matrix.test_set }}
+    #    path: memory_stat
+
+    #- name: Clean up
+    #  if: ${{ always() }}
+    #  run: |
+        #docker stop my-container && docker rm my-container
+        #docker volume rm DataVolume

.gitmodules

@@ -8,7 +8,7 @@
   branch = dev/ufs-weather-model
 [submodule "stochastic_physics"]
   path = stochastic_physics
-  url = https://github.com/noaa-psd/stochastic_physics
+  url = https://github.com/NOAA-PSL/stochastic_physics
   branch = master
 [submodule "CMakeModules"]
   path = CMakeModules

tests/ci/Dockerfile

@@ -1,19 +1,20 @@
-From noaaemc/ubuntu-hpc:v1.11b
+From noaaepic/ubuntu20.04-gnu9.3-hpc-stack:v1.2
+
+CMD ["/bin/bash"]
 
 ENV HOME=/home/builder
 COPY --chown=builder:builder . $HOME/ufs-weather-model
 
 USER builder
 ENV USER=builder
 ARG test_name
-ARG build_case
+ARG run_case
 ENV test_name=$test_name
-ENV build_case=$build_case
-ENV test_case=
+ENV run_case=$run_case
 ENV CI_TEST=true
 ENV RT_COMPILER=gnu
-ENV RT_MACHINE=linux.gnu
+ENV RT_MACHINE=linux
+ENV MACHINE_ID=linux
 
 WORKDIR $HOME/ufs-weather-model/tests
-RUN ./opnReqTest -n $test_name -c $build_case -z && tar -cvzf fv3.tar.gz fv3_*.exe modules.fv3_*
-CMD ./opnReqTest -n $test_name -c $test_case -x
+CMD ./opnReqTest -n $test_name -c $run_case

tests/ci/Jenkinsfile

@@ -0,0 +1,75 @@
+pipeline {
+    agent none
+
+    options {
+        disableConcurrentBuilds()
+        overrideIndexTriggers(false)
+        skipDefaultCheckout(true)
+    }
+
+    stages {
+        stage('ORT') {
+            matrix {
+                axes {
+                    axis {
+                        name 'TEST_NAME'
+                        values 'control', 'regional_control', 'cpld_control_nowave_noaero_p8'
+                    }
+
+                    axis {
+                        name 'TEST_CASE'
+                        values 'thr', 'mpi', 'dcp', 'rst', 'bit', 'dbg'
+                    }
+                }
+
+                excludes {
+                    exclude {
+                        axis {
+                            name 'TEST_NAME'
+                            values 'regional_control'
+                        }
+
+                        axis {
+                            name 'TEST_CASE'
+                            values 'mpi', 'rst', 'bit', 'dbg'
+                        }
+                    }
+
+                    exclude {
+                        axis {
+                            name 'TEST_NAME'
+                            values 'cpld_control_nowave_noaero_p8'
+                        }
+
+                        axis {
+                            name 'TEST_CASE'
+                            values 'mpi', 'dcp', 'rst', 'bit', 'thr' // TODO: Remove thr case from cpld_control_nowave_noaero_p8 exclusions when it is passing again
+                        }
+                    }
+                }
+
+                stages {
+                    stage('Test') {
+                        when {
+                            expression {
+                                !changeRequest()
+                            }
+                        }
+
+                        steps {
+                            build job: 'ufs-weather-model/ort-docker-pipeline', parameters: [string(name: 'TEST_NAME', value: "${env.TEST_NAME}"), string(name: 'TEST_CASE', value: "${env.TEST_CASE}"), string(name: 'WRAPPER_GIT_BRANCH', value: "${env.BRANCH_NAME}")]
+                        }
+                    }
+
+                    stage('Test for Change Request') {
+                        when { changeRequest() }
+
+                        steps {
+                            build job: 'ufs-weather-model/ort-docker-pipeline', parameters: [string(name: 'TEST_NAME', value: "${env.TEST_NAME}"), string(name: 'TEST_CASE', value: "${env.TEST_CASE}"), booleanParam(name: 'WRAPPER_CHANGE_REQUEST', value: true), string(name: 'WRAPPER_GIT_BRANCH', value: "${env.CHANGE_TARGET}"), string(name: 'WRAPPER_CHANGE_BRANCH', value: "${env.CHANGE_BRANCH}"), string(name: 'WRAPPER_CHANGE_FORK', value: "${env.CHANGE_FORK}")]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

tests/compile.sh

@@ -132,13 +132,13 @@ bash -x ${PATHTR}/build.sh
 
 mv ${BUILD_DIR}/ufs_model ${PATHTR}/tests/${BUILD_NAME}.exe
 if [[ "${MAKE_OPT}" == "-DDEBUG=ON" ]]; then
-  if [[ $MACHINE_ID == gaea.* ]]; then
+  if [[ $MACHINE_ID == gaea.* ]] || [[ $MACHINE_ID == linux.* ]]; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug ${PATHTR}/tests/modules.${BUILD_NAME}
   else
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}_debug.lua ${PATHTR}/tests/modules.${BUILD_NAME}.lua
   fi
 else
-  if [[ $MACHINE_ID == gaea.* ]]; then
+  if [[ $MACHINE_ID == gaea.* ]] || [[ $MACHINE_ID == linux.* ]]; then
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}       ${PATHTR}/tests/modules.${BUILD_NAME}
   else
     cp ${PATHTR}/modulefiles/ufs_${MACHINE_ID}.lua       ${PATHTR}/tests/modules.${BUILD_NAME}.lua

tests/default_vars.sh

@@ -370,6 +370,7 @@ export NSSL_INVERTCCN=.true.
 
 # Smoke
 export RRFS_SMOKE=.false.
+export RRFS_RESTART=NO
 export SEAS_OPT=2
 
 # GWD

tests/fv3_conf/fv3_qsub.IN_cheyenne

@@ -13,7 +13,9 @@ echo -n " $( date +%s )," >  job_timestamp.txt
 set +x
 MACHINE_ID=cheyenne
 source ./module-setup.sh
-module use $( pwd -P )
+mkdir modulefiles
+mv *.lua modulefiles
+module use modulefiles
 module load modules.fv3
 module list
 set -x

tests/fv3_conf/regional_rrfs_a_run.IN

@@ -0,0 +1,25 @@
+rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
+
+rm -rf INPUT RESTART
+mkdir  INPUT RESTART
+
+rsync -arv @[INPUTDATA_ROOT]/fv3_regional_rrfs_a/INPUT/. INPUT/.
+
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m11.nc aeroclim.m11.nc
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
+
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
+cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat

tests/fv3_conf/rrfs_warm_run.IN

@@ -3,7 +3,31 @@ mkdir INPUT RESTART
 
 OPNREQ_TEST=${OPNREQ_TEST:-false}
 SUFFIX=${RT_SUFFIX}
-cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
+
+if [[ "${RRFS_RESTART:-NO}" == YES ]] ; then
+    # cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+    # rm -f INPUT/fv_core.res.*
+    # rm -f INPUT/fv_srf_wnd.res.*
+    # rm -f INPUT/fv_tracer.res.*
+    # rm -f INPUT/phy_data.*
+    # rm -f INPUT/sfc_data.*
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
+    for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
+      RFILE_OLD=$(basename $RFILE)
+      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
+      cp $RFILE "INPUT/$RFILE_NEW"
+    done
+    for x in emi_data.nc SMOKE_GBBEPx_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
+        grid.tile7.halo4.nc ; do
+      cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
+    done
+    cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
+else
+  cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
+fi
 
 for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
          global_o3prdlos.f77 global_snoclim.1.875.grb global_zorclim.1x1.grb \