Test PR Board: Date Created, Priority Labels, Input Data Labels

.cicd/scripts/create_baseline.sh

@@ -183,6 +183,33 @@ function create_baseline() {
 		    pwd
 		    cp "$(dirname "${WORKSPACE}")/RegressionTests_${machine_id}.log" "${WORKSPACE}/tests/logs/"
 		    cd ${WORKSPACE}/tests/
+		elif [[ ${machine} =~ "Ursa" ]]
+		then
+		    echo "Creating baselines on ${machine}"
+		    export ACCNR=epic
+		    sed "s|QUEUE=batch|QUEUE=windfall|g" -i rt.sh
+		    local workflow="-r"
+		    ./rt.sh -a "${ACCNR}" -c "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
+		    status=${PIPESTATUS[0]}
+		    export DISKNM=/scratch3/NAGAPE/epic/role.epic/UFS-WM_RT
+		    cd ${DISKNM}/NEMSfv3gfs/
+		    mkdir -p develop-${BL_DATE}
+		    #cd  /scratch1/NCEPDEV/stmp4/role.epic/FV3_RT
+			cd /scratch3/NCEPDEV/stmp/role.epic/RT_RUNDIRS/role.epic/FV3_RT
+		    ls -l REGRESSION_TEST/.
+		    rsync -a --no-t REGRESSION_TEST/ "${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}" || echo "#### Warning! rsync $(pwd)/REGRESSION_TEST/ incomplete."
+		    cd ${WORKSPACE}/tests
+		    ./rt.sh -a "${ACCNR}" "${workflow}" "${opt}" "${suite}" | tee "${WORKSPACE}/tests/logs/RT-run-${machine}.log"
+		    status=${PIPESTATUS[0]}
+		    cd logs/
+		    cp "RegressionTests_${machine_id}.log" "$(dirname "${WORKSPACE}")" #/scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+		    git remote -v
+		    git fetch --no-recurse-submodules origin
+		    git reset FETCH_HEAD --hard
+		    cd .. && cd .. && cd ..
+		    pwd
+		    cp "$(dirname "${WORKSPACE}")/RegressionTests_${machine_id}.log" "${WORKSPACE}/tests/logs/"
+		    cd ${WORKSPACE}/tests/		
 		elif [[ ${machine} =~ "Derecho" ]]
 		then
 		    echo "Creating baselines on ${machine}"

.github/workflows/update_project_labels.yaml

@@ -6,7 +6,6 @@ on:
       - reopened
       - labeled
       - unlabeled
-      - push #rm for actual PR
 
 jobs:
   baseline-labels:
@@ -73,33 +72,57 @@ jobs:
       pull-requests: write
       issues: write
     steps:
-      - name: Input data required
-        if: contains(github.event.pull_request.labels.*.name, 'Input Data Changes')
+      - name: Additions to current input-data directory required
+        if: |
+          contains(github.event.pull_request.labels.*.name, 'Adds Input Data') &&
+          !contains(github.event.pull_request.labels.*.name, 'Changes Existing Input Data')
         uses: nipe0324/update-project-v2-item-field@v2.0.2
         with:
           #project-url: https://github.com/orgs/ufs-community/projects/70
           project-url: https://github.com/orgs/NOAA-EPIC/projects/18
           github-token: ${{ secrets.PR_PROJECT_TOKEN }}
           field-name: "Input Data Req'd"
-          field-value: 'Yes'
+          field-value: 'Adds'
+      - name: New input-data directory required
+        if: |
+          contains(github.event.pull_request.labels.*.name, 'Changes Existing Input Data') &&
+          !contains(github.event.pull_request.labels.*.name, 'Adds Input Data')
+        uses: nipe0324/update-project-v2-item-field@v2.0.2
+        with:
+          #project-url: https://github.com/orgs/ufs-community/projects/70
+          project-url: https://github.com/orgs/NOAA-EPIC/projects/18
+          github-token: ${{ secrets.PR_PROJECT_TOKEN }}
+          field-name: "Input Data Req'd"
+          field-value: 'Create New'
       - name: No input data changes
-        if: (!contains(github.event.pull_request.labels.*.name, 'Input Data Changes'))
+        if: |
+            (!contains(github.event.pull_request.labels.*.name, 'Changes Existing Input Data')) && 
+            (!contains(github.event.pull_request.labels.*.name, 'Adds Input Data'))
         uses: nipe0324/update-project-v2-item-field@v2.0.2
         with:
           #project-url: https://github.com/orgs/ufs-community/projects/70
           project-url: https://github.com/orgs/NOAA-EPIC/projects/18
           github-token: ${{ secrets.PR_PROJECT_TOKEN }}
           field-name: "Input Data Req'd"
-          field-value: 'No'
+          field-value: 'None'
+      - name: Contradictory labels
+        if: | 
+            contains(github.event.pull_request.labels.*.name, 'Adds Input Data') &&
+            contains(github.event.pull_request.labels.*.name, 'Changes Existing Input Data')
+        uses: nipe0324/update-project-v2-item-field@v2.0.2
+        with:
+          #project-url: https://github.com/orgs/ufs-community/projects/70
+          project-url: https://github.com/orgs/NOAA-EPIC/projects/18
+          github-token: ${{ secrets.PR_PROJECT_TOKEN }}
+          field-name: "Input Data Req'd"
+          field-value: 'Unknown'
   priority-labels:
     name: Priority
     runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
       issues: write
-    env:
-      PRIORITY: ''
     steps:
       - name: Read Priority field
         uses: EndBug/project-fields@v2.1.0
@@ -112,17 +135,15 @@ jobs:
           project_url: https://github.com/orgs/NOAA-EPIC/projects/18
           resource_url: ${{ github.event.pull_request.html_url }}
       - name: Assign value to Priority field
+        id: assign_priority
         run: |
-          priority="${{ steps.priority_field.outputs.values }}"
-          echo $priority
-          echo "PRIORITY=$priority" >> $GITHUB_ENV
-          echo $PRIORITY
-          echo $( [ $PRIORITY != 'Combine' ] )
+          PRIORITY="${{ steps.priority_field.outputs.values }}"
+          echo "priority=$PRIORITY" >> $GITHUB_OUTPUT
       - name: Normal Priority
         if: |
             !contains(github.event.pull_request.labels.*.name, 'Priority: Critical') &&
             !contains(github.event.pull_request.labels.*.name, 'Priority: High') &&
-            ${{ env.PRIORITY != 'Combine' }}
+            steps.assign_priority.outputs.priority != 'Combine'
         uses: nipe0324/update-project-v2-item-field@v2.0.2
         with:
           #project-url: https://github.com/orgs/ufs-community/projects/70
@@ -131,7 +152,9 @@ jobs:
           field-name: 'Priority'
           field-value: 'Normal'
       - name: Critical priority
-        if: "contains(github.event.pull_request.labels.*.name, 'Priority: Critical')"
+        if: |
+          contains(github.event.pull_request.labels.*.name, 'Priority: Critical') &&
+          steps.assign_priority.outputs.priority != 'Combine'
         uses: nipe0324/update-project-v2-item-field@v2.0.2
         with:
           #project-url: https://github.com/orgs/ufs-community/projects/70
@@ -140,7 +163,9 @@ jobs:
           field-name: 'Priority'
           field-value: 'Critical'
       - name: High Priority
-        if: "(contains(github.event.pull_request.labels.*.name, 'Priority: High'))"
+        if: |
+            (contains(github.event.pull_request.labels.*.name, 'Priority: High')) &&
+            steps.assign_priority.outputs.priority != 'Combine'
         uses: nipe0324/update-project-v2-item-field@v2.0.2
         with:
           #project-url: https://github.com/orgs/ufs-community/projects/70
@@ -159,3 +184,73 @@ jobs:
           github-token: ${{ secrets.PR_PROJECT_TOKEN }}
           field-name: 'Priority'
           field-value: 'Unknown'
+  subcomponent-labels:
+    name: Subcomponents involved
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
+    env:
+      SUBCOMPONENTS: ''
+    steps:
+      - name: UFSATM
+        if: contains(github.event.pull_request.labels.*.name, 'UFSATM')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} UFSATM" >> $GITHUB_ENV
+      - name: CCPP
+        if: contains(github.event.pull_request.labels.*.name, 'CCPP')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} CCPP" >> $GITHUB_ENV
+      - name: atmos_cubed_sphere
+        if: contains(github.event.pull_request.labels.*.name, 'A3S')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} A3S" >> $GITHUB_ENV
+      - name: UPP
+        if: contains(github.event.pull_request.labels.*.name, 'UPP')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} UPP" >> $GITHUB_ENV
+      - name: stochastic_physics
+        if: contains(github.event.pull_request.labels.*.name, 'SP')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} SP" >> $GITHUB_ENV
+      - name: AQM
+        if: contains(github.event.pull_request.labels.*.name, 'AQM')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} AQM" >> $GITHUB_ENV
+      - name: CMEPS
+        if: contains(github.event.pull_request.labels.*.name, 'CMEPS')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} CMEPS" >> $GITHUB_ENV
+      - name: CDEPS
+        if: contains(github.event.pull_request.labels.*.name, 'CDEPS')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} CDEPS" >> $GITHUB_ENV
+      - name: CICE
+        if: contains(github.event.pull_request.labels.*.name, 'CICE')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} CICE" >> $GITHUB_ENV
+      - name: GOCART
+        if: contains(github.event.pull_request.labels.*.name, 'GOC')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} GOC" >> $GITHUB_ENV
+      - name: MOM6
+        if: contains(github.event.pull_request.labels.*.name, 'MOM')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} MOM" >> $GITHUB_ENV
+      - name: NOAHMP
+        if: contains(github.event.pull_request.labels.*.name, 'NMP')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} NMP" >> $GITHUB_ENV
+      - name: WW3
+        if: contains(github.event.pull_request.labels.*.name, 'WW3')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} WW3" >> $GITHUB_ENV
+      - name: LM4
+        if: contains(github.event.pull_request.labels.*.name, 'LM4')
+        run: echo "SUBCOMPONENTS=${SUBCOMPONENTS} LM4" >> $GITHUB_ENV
+      - name: Update subcomponents text
+        if: ${{ env.SUBCOMPONENTS != '' }} #Fix to use non-env var solution
+        uses: nipe0324/update-project-v2-item-field@v2.0.2
+        with:
+          #project-url: https://github.com/orgs/ufs-community/projects/70
+          project-url: https://github.com/orgs/NOAA-EPIC/projects/18
+          github-token: ${{ secrets.PR_PROJECT_TOKEN }}
+          field-name: "Subcomponent PRs"
+          field-value: ${{ env.SUBCOMPONENTS }}
+      - name: WM only
+        if: ${{ env.SUBCOMPONENTS == '' }} #Fix to use non-env var solution
+        uses: nipe0324/update-project-v2-item-field@v2.0.2
+        with:
+          #project-url: https://github.com/orgs/ufs-community/projects/70
+          project-url: https://github.com/orgs/NOAA-EPIC/projects/18
+          github-token: ${{ secrets.PR_PROJECT_TOKEN }}
+          field-name: "Subcomponent PRs"
+          field-value: 'WM only'

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20251007
+export BL_DATE=20251024

tests/default_vars.sh

@@ -547,7 +547,7 @@ export_mpas ()
     export MPAS_RESOLUTION=120
 
     export ATM_compute_tasks=4
-    
+
     #DJS2025 START: We don't need this for MPAS, but to setup the tests we do. CLEAN THIS UP!!!
     #Set defaults if ATMRES and DT_ATMOS are not set
     export ATMRES=${ATMRES:-"C96"}
@@ -662,7 +662,7 @@ export_gfs_physics ()
     export RRTMGP_NGPTSLW=128
     export RRTMGP_NBANDSLW=16
     export RRTMGP_NBANDSSW=14
-    
+
     # Microphysics
     export IMP_PHYSICS=8
     export NWAT=6
@@ -729,7 +729,7 @@ export_gfs_physics ()
     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.
 
@@ -883,6 +883,7 @@ export NTILES=6
 export INPES=${INPES_dflt}
 export JNPES=${JNPES_dflt}
 export RESTART_INTERVAL=0
+export USE_FV3_ROUTEHANDLES=.false.
 export QUILTING=.true.
 export QUILTING_RESTART=.true.
 export WRITE_GROUP=1
@@ -1631,6 +1632,7 @@ export_mom6() {
   export MOM6_CHLCLIM=seawifs_1998-2006_smoothed_2X.nc
   export MOM6_USE_LI2016=True
   export MOM6_TOPOEDITS=''
+  export MOM6_HFREEZE=20.0
   # since CPL_SLOW is set to DT_THERM, this should be always be false
   export MOM6_THERMO_SPAN=False
   export MOM6_USE_WAVES=True

tests/fv3_conf/cpld_control_run.IN

@@ -170,6 +170,12 @@ else
         if [ $CPLLND = .true. ]; then
             cp ../${DEP_RUN}${SUFFIX}/ufs.cpld.lnd.out.${RESTART_FILE_SUFFIX_SECS}.tile*.nc RESTART/.
         fi
+
+        # FV3 route handle files
+        if [[ $USE_FV3_ROUTEHANDLES = .true. ]]; then
+            cp ../${DEP_RUN}${SUFFIX}/routehandle_fb* ./
+        fi
+
     elif [[ $ULTRALOW == .true. ]]; then
         # Warm starts from ICs; all cases use 9km unstructured WW3
         cp ${FV3_IC}/*.nc ./INPUT