HR4 GWD update for FV3

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20240614
+export BL_DATE=20240624

tests/ci/Jenkinsfile.combined

@@ -326,7 +326,7 @@ def generateStage(nodeLabel) {
  GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
  GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
 
- curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels -d '{"labels":["$machine-.*RT|$machine-.*BL"]}'
+ curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
  '''
  s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "**/*tgz*", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
  currentBuild.result = 'FAILURE'

tests/ci/Jenkinsfile.ort

@@ -0,0 +1,107 @@
+pipeline {
+ agent none
+ stages {
+ stage('Run ORTs') {
+ agent {
+ label 'built-in' 
+ }
+ steps {
+ script {
+ for (label in pullRequest.labels) {
+ if ((label.matches("orion"))) {
+ env.CHOICE_NODE='orion'
+ } 
+ else if ((label.matches("hera"))) { 
+ env.CHOICE_NODE='hera'
+ } 
+ else if ((label.matches("hercules"))) { 
+ env.CHOICE_NODE='hercules'
+ } 
+ else if ((label.matches("jet"))) {
+ env.CHOICE_NODE='jet'
+ } 
+ else { 
+ env.CHOICE_NODE='none'
+ }
+ }
+// Why do I need another if..block, because it just works this way.
+
+ if (CHOICE_NODE == 'orion') {
+ echo "Starting up orion ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+
+ } 
+ else if (CHOICE_NODE == 'jet') {
+ echo "Starting up jet ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+ }
+ else if (CHOICE_NODE == 'hercules') {
+ echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+ }
+ else if (CHOICE_NODE == 'hera') {
+ echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+ }
+ else {
+ echo "${CHOICE_NODE} is NOT a platform, moving on..."
+ }
+ } 
+ }
+ } 
+ stage('Run ORT on Hera') {
+ agent {
+ label "hera"
+ }
+ environment {
+ ACCNR = 'epic'
+ NODE_PATH = '/scratch2/NAGAPE/epic/role.epic/'
+ }
+ steps {
+
+ cleanWs()
+ checkout scm
+ sh '''
+ git submodule update --init --recursive
+ cd tests/fv3_conf
+ sed 's/#SBATCH --time=.*/#SBATCH --time=02:00:00/g' -i fv3_slurm.IN_hera
+ cd ..
+ export machine=${NODE_NAME}
+ export PATH=$PATH:~/bin
+ echo $CHANGE_ID
+ export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
+ export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
+ pwd
+ sed "s|intel|gnu|g" -i opnReqTest
+ export ACCNR=epic
+ ./opnReqTest -n regional_control -a ${ACCNR} -c bit,dcp,thr
+ cd logs/
+ cp OpnReqTests_regional_control_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+ cd ..
+ ./opnReqTest -n cpld_control_nowave_noaero_p8 -a ${ACCNR} -c dbg,rst
+ cd logs/
+ cp OpnReqTests_cpld_control_nowave_noaero_p8_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+ cd ..
+ ./opnReqTest -n control_p8 -a ${ACCNR} -c std,dbg,bit,mpi,rst,thr,dcp
+ cd logs/
+ cp OpnReqTests_control_p8_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+ git remote -v
+ git fetch --no-recurse-submodules origin
+ git reset FETCH_HEAD --hard
+ cd .. && cd .. && cd ..
+ cp OpnReqTests_control_p8_hera.log $WORKSPACE/tests/logs/
+ cp OpnReqTests_regional_control_hera.log $WORKSPACE/tests/logs/
+ cp OpnReqTests_cpld_control_nowave_noaero_p8_hera.log $WORKSPACE/tests/logs/
+ cd $WORKSPACE/tests/
+ git config user.email "[email protected]"
+ git config user.name "epic-cicd-jenkins"
+ echo "Testing concluded...removing labels for $machine from $GIT_URL"
+
+ export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }')
+ git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
+ git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
+ git add logs/OpnReqTests_control_p8_hera.log logs/OpnReqTests_regional_control_hera.log logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+ git commit -m "ORT Jobs Completed.\n\n\n on-behalf-of @ufs-community <[email protected]>"
+ git pull sshorigin $FORK_BRANCH
+ git push sshorigin HEAD:$FORK_BRANCH
+ '''
+ }
+ } 
+ }
+}

tests/default_vars.sh

@@ -624,6 +624,8 @@ export DO_UGWP_V1_W_GSLDRAG=.false.
 export DO_UGWP_V0_OROG_ONLY=.false.
 export DO_GSL_DRAG_LS_BL=.false.
 export DO_GSL_DRAG_SS=.true.
+export DO_GWD_OPT_PSL=.false.
+export PSL_GWD_DX_FACTOR=6.0
 export DO_GSL_DRAG_TOFD=.false.
 export DO_UGWP_V1=.false.
 export DO_UGWP_V1_OROG_ONLY=.false.

tests/fv3_conf/control_run.IN

@@ -23,7 +23,7 @@ if [ $WARM_START = .false. ]; then
  elif [ "$V2_SFC_FILE" = "true" ]; then
  cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
  else
- cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127/* ./INPUT/.
+ cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
  fi
 else
  mkdir INPUT RESTART

tests/fv3_conf/cpld_control_run.IN

@@ -183,8 +183,8 @@ if [ $IAER = 1011 ]; then
 fi
 
 cp @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
-cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ls* ./INPUT
-cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ss* ./INPUT
+cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ls* ./INPUT
+cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ss* ./INPUT
 
 if [ $IMP_PHYSICS = 8 ]; then
  cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN CCN_ACTIVATE.BIN

tests/logs/OpnReqTests_control_p8_hera.log

@@ -1,9 +1,9 @@
-Fri Jun 28 12:40:12 UTC 2024
+Sun Jul 7 19:56:59 UTC 2024
 Start Operation Requirement Test
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/bit_base_bit_base
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 278.149410
- 0: The maximum resident set size (KB) = 1448036
+ 0: The total amount of wall time = 280.646356
+ 0: The maximum resident set size (KB) = 1444896
 
 Test bit_base PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/dbg_base_dbg_base
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 978.713008
- 0: The maximum resident set size (KB) = 1435680
+ 0: The total amount of wall time = 1003.437253
+ 0: The maximum resident set size (KB) = 1430112
 
 Test dbg_base PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/dcp_dcp
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 249.442600
- 0: The maximum resident set size (KB) = 1424744
+ 0: The total amount of wall time = 249.484393
+ 0: The maximum resident set size (KB) = 1425876
 
 Test dcp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/mpi_mpi
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 251.855654
- 0: The maximum resident set size (KB) = 1430024
+ 0: The total amount of wall time = 250.029285
+ 0: The maximum resident set size (KB) = 1435352
 
 Test mpi PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/rst_rst
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 251.841071
- 0: The maximum resident set size (KB) = 1423276
+ 0: The total amount of wall time = 249.870001
+ 0: The maximum resident set size (KB) = 1424956
 
 Test rst PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/std_base_std_base
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 254.210275
- 0: The maximum resident set size (KB) = 1432268
+ 0: The total amount of wall time = 247.121930
+ 0: The maximum resident set size (KB) = 1438272
 
 Test std_base PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/thr_thr
+baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
+working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 248.567157
- 0: The maximum resident set size (KB) = 1424576
+ 0: The total amount of wall time = 251.892903
+ 0: The maximum resident set size (KB) = 1423700
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jun 28 13:51:40 UTC 2024
-Elapsed time: 01h:11m:29s. Have a nice day!
+Sun Jul 7 21:02:25 UTC 2024
+Elapsed time: 01h:05m:27s. Have a nice day!