Update and resolve conflicts

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20240830
+export BL_DATE=20240909

tests/ci/Jenkinsfile.combined

@@ -343,12 +343,18 @@ pipeline {
         GIT_URL = 'https://github.com/ufs-community/ufs-weather-model.git'
     }
     stages {
-        stage('Run SonarQube Testing') {
+        stage('Launch SonarQube') {
             steps {
                 script {
+                    echo "BRANCH_NAME=${env.CHANGE_BRANCH}"
+                    echo "FORK_NAME=${env.CHANGE_FORK}"
+                    echo "CHANGE_URL=${env.CHANGE_URL}"
+                    echo "CHANGE_ID=${env.CHANGE_ID}"
                     build job: '/ufs-weather-model/ufs-wm-sonarqube', parameters: [
                         string(name: 'BRANCH_NAME', value: env.CHANGE_BRANCH ?: 'develop'),
-                        string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: '')
+                        string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: ''),
+                        string(name: 'CHANGE_URL', value: env.CHANGE_URL ?: ''),
+                        string(name: 'CHANGE_ID', value: env.CHANGE_ID ?: '')
                     ], wait: false
                 }
             }

tests/default_vars.sh

@@ -716,6 +716,7 @@ export KNOB_UGWP_TAUAMP=3.0e-3
 export KNOB_UGWP_LHMET=200.0e3
 export KNOB_UGWP_OROSOLV="'pss-1986'"
 
+export KNOB_UGWP_TAUAMP=3.0e-3
 export DO_UGWP_V0_NST_ONLY=.false.
 
 # resolution dependent settings
@@ -858,7 +859,6 @@ export FSICS=0
 
 # Dynamical core
 export FV_CORE_TAU=0.
-export RF_CUTOFF=10.0
 export FAST_TAU_W_SEC=0.2
 export DRY_MASS=98320.0
 
@@ -1038,23 +1038,137 @@ export LDEBUG=.false.
 
 # Add section for tiled grid namelist
 export_tiled() {
-export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
-export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
-export FNALBC="'${ATMRES}.snowfree_albedo.tileX.nc'"
-export FNALBC2="'${ATMRES}.facsf.tileX.nc'"
-export FNTG3C="'${ATMRES}.substrate_temperature.tileX.nc'"
-export FNVEGC="'${ATMRES}.vegetation_greenness.tileX.nc'"
-export FNVETC="'${ATMRES}.vegetation_type.tileX.nc'"
-export FNSOTC="'${ATMRES}.soil_type.tileX.nc'"
-export FNSOCC="'${ATMRES}.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'${ATMRES}.vegetation_greenness.tileX.nc'"
-export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
-export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
-export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
+  export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
+  export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
+  export FNALBC="'${ATMRES}.snowfree_albedo.tileX.nc'"
+  export FNALBC2="'${ATMRES}.facsf.tileX.nc'"
+  export FNTG3C="'${ATMRES}.substrate_temperature.tileX.nc'"
+  export FNVEGC="'${ATMRES}.vegetation_greenness.tileX.nc'"
+  export FNVETC="'${ATMRES}.vegetation_type.tileX.nc'"
+  export FNSOTC="'${ATMRES}.soil_type.tileX.nc'"
+  export FNSOCC="'${ATMRES}.soil_color.tileX.nc'"
+  export FNSMCC=${FNSMCC_control}
+  export FNMSKH=${FNMSKH_control}
+  export FNVMNC="'${ATMRES}.vegetation_greenness.tileX.nc'"
+  export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
+  export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
+  export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
+  export LANDICE=".false."
+}
+
+export_ugwpv1() {
+  export DO_UGWP_V1=.true.
+  export DO_UGWP_V0=.false.
+  export GWD_OPT=2
+  export KNOB_UGWP_VERSION=1
+  export KNOB_UGWP_NSLOPE=1
+  export DO_GSL_DRAG_LS_BL=.true.
+  export DO_GSL_DRAG_SS=.true.
+  export DO_GSL_DRAG_TOFD=.true.
+  export DO_UGWP_V1_OROG_ONLY=.false.
+  export DO_UGWP_V0_NST_ONLY=.false.
+  export LDIAG_UGWP=.false.
+  export KNOB_UGWP_DOKDIS=2
+  export KNOB_UGWP_NDX4LH=4
+
+  # Add updated damping and timestep variables
+  case "${ATMRES}" in
+    "C48")
+      export DT_ATMOS=720
+      export XR_CNVCLD=.false.
+      export CDMBGWD="0.071,2.1,1.0,1.0"
+      export CDMBGWD_GSL="40.0,1.77,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=6.0e-3
+      export K_SPLIT=1
+      export N_SPLIT=4
+      export TAU=10.0
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=3600
+      ;;
+    "C96")
+      export DT_ATMOS=720
+      export XR_CNVCLD=.false.
+      export CDMBGWD="0.14,1.8,1.0,1.0"
+      export CDMBGWD_GSL="20.0,2.5,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=3.0e-3
+      export K_SPLIT=1
+      export N_SPLIT=4
+      export TAU=8.0
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=1800
+      ;;
+    "C192")
+      export DT_ATMOS=600
+      export XR_CNVCLD=.true.
+      export CDMBGWD="0.23,1.5,1.0,1.0"
+      export CDMBGWD_GSL="5.0,5.0,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=1.5e-3
+      export K_SPLIT=2
+      export N_SPLIT=5
+      export TAU=6.0
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=1800
+      ;;
+    "C384")
+      export DT_ATMOS=300
+      export XR_CNVCLD=.true.
+      export CDMBGWD="1.1,0.72,1.0,1.0"
+      export CDMBGWD_GSL="5.0,5.0,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=0.8e-3
+      export K_SPLIT=2
+      export N_SPLIT=4
+      export TAU=4.0
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=900
+      ;;
+    "C768")
+      export DT_ATMOS=150
+      export XR_CNVCLD=.true.
+      export CDMBGWD="4.0,0.15,1.0,1.0"
+      export CDMBGWD_GSL="2.5,7.5,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=0.5e-3
+      export K_SPLIT=2
+      export N_SPLIT=4
+      export TAU=3.0
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=450
+      ;;
+    "C1152")
+      export DT_ATMOS=150
+      export XR_CNVCLD=.true.
+      export CDMBGWD="4.0,0.10,1.0,1.0"
+      export CDMBGWD_GSL="1.67,8.8,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=0.35e-3
+      export K_SPLIT=2
+      export N_SPLIT=6
+      export TAU=2.5
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=450
+      ;;
+    "C3072")
+      export DT_ATMOS=90
+      export XR_CNVCLD=.true.
+      export CDMBGWD="4.0,0.05,1.0,1.0"
+      export CDMBGWD_GSL="0.625,14.1,1.0,1.0"
+      export KNOB_UGWP_TAUAMP=0.13e-3
+      export K_SPLIT=4
+      export N_SPLIT=5
+      export TAU=0.5
+      export RF_CUTOFF=100.0
+      export FV_SG_ADJ=300
+      ;;
+    *)
+      echo Invalid model resolution: "${ATMRES}". Please update specified variable ATMRES.
+      exit 1
+      ;;
+  esac
+
+  if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
+  if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
+  export DT_INNER=${DT_ATMOS}
+
 }
+
 
 # Defaults for the CICE6 model namelist, mx100
 export_cice6() {

tests/logs/OpnReqTests_control_p8_hera.log

@@ -1,9 +1,9 @@
-Fri Aug 30 16:11:42 UTC 2024
+Mon Sep  9 23:10:23 UTC 2024
 Start Operation Requirement Test
 
 
 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_1541961/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 285.319725
-  0: The maximum resident set size (KB)                   = 1459076
+  0: The total amount of wall time                        = 301.063864
+  0: The maximum resident set size (KB)                   = 1450936
 
 Test bit_base PASS
 
 
 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_1541961/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 980.288173
-  0: The maximum resident set size (KB)                   = 1424524
+  0: The total amount of wall time                        = 1003.768135
+  0: The maximum resident set size (KB)                   = 1432920
 
 Test dbg_base PASS
 
 
 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_1541961/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 248.004317
-  0: The maximum resident set size (KB)                   = 1435996
+  0: The total amount of wall time                        = 272.986390
+  0: The maximum resident set size (KB)                   = 1418504
 
 Test dcp PASS
 
 
 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_1541961/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 254.881553
-  0: The maximum resident set size (KB)                   = 1426068
+  0: The total amount of wall time                        = 271.716758
+  0: The maximum resident set size (KB)                   = 1429720
 
 Test mpi PASS
 
 
 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_1541961/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 247.371317
-  0: The maximum resident set size (KB)                   = 1438120
+  0: The total amount of wall time                        = 271.525308
+  0: The maximum resident set size (KB)                   = 1430068
 
 Test rst PASS
 
 
 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_1541961/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 247.964958
-  0: The maximum resident set size (KB)                   = 1426916
+  0: The total amount of wall time                        = 270.165754
+  0: The maximum resident set size (KB)                   = 1429764
 
 Test std_base PASS
 
 
 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_1541961/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/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                        = 249.125554
-  0: The maximum resident set size (KB)                   = 1430064
+  0: The total amount of wall time                        = 270.519887
+  0: The maximum resident set size (KB)                   = 1441764
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Aug 30 17:24:37 UTC 2024
-Elapsed time: 01h:12m:55s. Have a nice day!
+Tue Sep 10 00:41:38 UTC 2024
+Elapsed time: 01h:31m:15s. Have a nice day!

tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

@@ -1,9 +1,9 @@
-Fri Aug 30 15:02:11 UTC 2024
+Mon Sep  9 21:29:33 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_199771/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268951/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 1313.770246
-  0: The maximum resident set size (KB)                   = 1554336
+  0: The total amount of wall time                        = 2492.069029
+  0: The maximum resident set size (KB)                   = 1537788
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_199771/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268951/rst_rst
 Checking test rst results ....
  Comparing sfcf021.tile1.nc .....USING NCCMP......OK
  Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 457.172265
-  0: The maximum resident set size (KB)                   = 1528760
+  0: The total amount of wall time                        = 654.617351
+  0: The maximum resident set size (KB)                   = 1509560
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_199771/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268951/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 498.642653
-  0: The maximum resident set size (KB)                   = 1526632
+  0: The total amount of wall time                        = 760.383664
+  0: The maximum resident set size (KB)                   = 1533208
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Aug 30 16:11:42 UTC 2024
-Elapsed time: 01h:09m:32s. Have a nice day!
+Mon Sep  9 23:10:23 UTC 2024
+Elapsed time: 01h:40m:51s. Have a nice day!