Merge remote-tracking branch 'origin/develop' into issue3901

EricSinsky-NOAA · EricSinsky-NOAA · commit 9229fcb30a7f · 2025-09-25T14:30:44.000Z
diff --git a/.github/ISSUE_TEMPLATE/new_feature.yml b/.github/ISSUE_TEMPLATE/new_feature.yml
@@ -20,14 +20,9 @@ body:
     id: description
     attributes:
       label: What new functionality do you need?
-      placeholder: Provide a consise description of the problem to be addressed by this new feature. Please be clear what parts of the problem are considered to be in-scope and out-of-scope
-    validations:
-      required: true
-
-  - type: textarea
-    id: requirements
-    attributes:
-      label: What are the requirements for the new functionality?
+      placeholder: Provide a concise description of the problem to be addressed by this new feature. Please be clear what parts of the problem are considered to be in-scope and out-of-scope.  Consider including:
+        - What are the requirements for the new functionality?
+        - Are there any links to related issues, discussions, or resources that provide additional context?
     validations:
       required: true
 
@@ -47,7 +42,7 @@ body:
         - [ ] Criterion #2
         - [ ] Criterion #3
     validations:
-      required: true
+      required: false
 
   - type: textarea
     id: suggested_solution
diff --git a/.github/ISSUE_TEMPLATE/static_data.yml b/.github/ISSUE_TEMPLATE/static_data.yml
@@ -4,10 +4,18 @@ labels: ["Static Data Mgmt"]
 projects: ["NOAA-EMC/41"]
 assignees:
   - DavidHuber-NOAA
-  - aerorahul 
+  - aerorahul
 
 body:
-  - type: dropdown
+  - type: markdown
+    attributes:
+      description: |
+        Process:
+        - Stage data on Ursa or WCOSS2
+        - Make sure permissions are set properly (global read access)
+        - CMs will push data and ask for verification
+
+  - type: checkboxes
     attributes:
       label: Type of static data
       description: |
@@ -21,7 +29,7 @@ body:
     validations:
       required: true
 
-  - type: dropdown
+  - type: checkboxes
     attributes:
       label: Target directory
       options:
@@ -78,7 +86,7 @@ body:
     validations:
       required: true
 
-  - type: dropdown
+  - type: checkboxes
     attributes:
       label: Any workflow changes needed?
       description: |
@@ -100,11 +108,11 @@ body:
     validations:
       required: false
 
-  - type: input
+  - type: textarea
     attributes:
       label: Pickup location
       description: |
-        Please provide a path to the data on either Hera or WCOSS.
+        Please provide path(s) to the data on either Ursa or WCOSS.
 
         If this requires a version update, please provide a CLEAN copy of the *entire* directory, including the structure and unchanged files from current directory.
 
@@ -113,14 +121,6 @@ body:
     validations:
       required: true
 
-  - type: input
-    attributes:
-      label: Size
-      description: How much data needs to be copied (size of pickup location in MB)?
-      placeholder: '0'
-    validations:
-      required: true
-
   - type: textarea
     attributes:
       label: Additional information
@@ -131,21 +131,19 @@ body:
 
   - type: checkboxes
     attributes:
-      label: Tasks for issue assignee
+      label: Checklist for GW CM
       options:
         - label: (Providing user) Discuss needs with global-workflow developer assigned to request
-        - label: (Providing user) Stage a CLEAN copy of data on Hera or WCOSS2 in the location provided above
         - label: (Global Workflow CM) Update data in "glopara"-managed space on supported platforms (see checklist below)
         - label: (Global Workflow CM - Fix only) Update "Fix File Management" [spreadsheet](https://docs.google.com/spreadsheets/d/1BeIvcz6TO3If4YCqkUK-oz_kGS9q2wTjwLS-BBemSEY/edit?usp=sharing)
         - label: (Developer) Make related workflow/component updates (if any)
 
   - type: checkboxes
     attributes:
-      label: Sync to supported platforms (for issue assignee)
+      label: Checklist for GW CM Only: Sync to supported platforms
       options:
         - label: WCOSS2
         - label: Gaea C6
-        - label: Hera
         - label: Ursa
         - label: MSU
         - label: AWS
diff --git a/.github/workflows/trigger-gitlab-pipelines.yml b/.github/workflows/trigger-gitlab-pipelines.yml
@@ -76,8 +76,16 @@ jobs:
               echo "PR ${PR_NUM} not found"
               exit 1
             fi
+            # Get the PR head commit SHA for GitLab GitHub integration
+            PR_HEAD_SHA=$(gh pr view "${PR_NUM}" --repo "${{ vars.GW_REPO_URL }}" --json headRefOid --jq '.headRefOid')
+            echo "Found PR ${PR_NUM} with HEAD SHA: ${PR_HEAD_SHA}"
+          else
+            # For develop branch, use the current commit SHA
+            PR_HEAD_SHA="${{ github.sha }}"
+            echo "Using develop branch SHA: ${PR_HEAD_SHA}"
           fi
           echo "PR_NUM=${PR_NUM}" >> ${GITHUB_ENV}
+          echo "PR_HEAD_SHA=${PR_HEAD_SHA}" >> ${GITHUB_ENV}
 
           # Set pipeline type based on selection
           case "${{ github.event.inputs.pipeline_type }}" in
@@ -141,10 +149,12 @@ jobs:
           # Important note: This token should be a proper GitLab Pipeline Trigger token
           # created via Settings > CI/CD > Pipeline triggers in your GitLab project
 
+          # Pass GitHub commit SHA to GitLab for native GitHub integration
           curl --verbose --request POST \
             --form "token=${{ secrets.GITLAB_TRIGGER_TOKEN }}" \
             --form "ref=develop" \
             --form "variables[PR_NUMBER]=${{ env.PR_NUM }}" \
+            --form "variables[GITHUB_COMMIT_SHA]=${{ env.PR_HEAD_SHA }}" \
             --form "variables[GW_REPO_URL]=${{ vars.GW_REPO_URL }}" \
             --form "variables[RUN_ON_MACHINES]=${{ env.MACHINES }}" \
             --form "variables[PIPELINE_TYPE]=${{ env.PIPELINE_TYPE }}" \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -46,6 +46,7 @@ variables:
   RUNNER_AFTER_SCRIPT_TIMEOUT: 8h
   PR_NUMBER: 0 # PR number is set by GitHub Actions
                # when the pipeline is triggered from a PR
+  GITHUB_COMMIT_SHA: "" # GitHub commit SHA for native GitLab integration
 
 workflow:
   name: "PR ${PR_NUMBER} - ${RUN_ON_MACHINES} (${GFS_CI_RUN_TYPE})"
@@ -108,6 +109,15 @@ include:
         exit 1
       fi
 
+      # Configure GitLab native GitHub integration
+      if [[ -n "${GITHUB_COMMIT_SHA:-}" && ${PR_NUMBER} -ne 0 ]]; then
+        echo "Configuring GitLab native GitHub integration for commit: ${GITHUB_COMMIT_SHA}"
+        export CI_COMMIT_SHA="${GITHUB_COMMIT_SHA}"
+        echo "GitLab will report status to GitHub for this commit"
+      else
+        echo "Using GitLab default commit SHA for status reporting"
+      fi
+
 # Common build template for all modalities
 .build_template:
   extends:
diff --git a/dev/ci/cases/gfsv17/s2sw.yaml b/dev/ci/cases/gfsv17/s2sw.yaml
@@ -22,6 +22,7 @@ base:
   SDATE_GFS: 2024111512
   FHMAX_GFS: 384
   FHMAX_HF_GFS: 120
+  CASE_HIST: "C768"
 
 prepoceanobs:
   use_exp_obs: "YES"
diff --git a/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml
@@ -22,6 +22,7 @@ base:
   NMEM_ENS_GFS: 2
   NMEM_ENS_GFS_OFFSET: 0
   DO_TEST_MODE: "NO"
+  CASE_HIST: "C48"
 
 marineanl:
   SOCA_NINNER: 1
diff --git a/dev/parm/config/gcafs/config.base.j2 b/dev/parm/config/gcafs/config.base.j2
@@ -204,6 +204,7 @@ export OPS_RES="C768" # Do not change # TODO: Why is this needed and where is it
 export LEVS=128
 export CASE="{{ CASE_CTL }}"
 export CASE_ENS="{{ CASE_ENS }}"
+export CASE_HIST="{{ CASE_HIST | default('${CASE}') }}"
 export OCNRES="{{ OCNRES }}"
 export ICERES="${OCNRES}"
 
diff --git a/dev/parm/config/gefs/config.base.j2 b/dev/parm/config/gefs/config.base.j2
@@ -150,6 +150,7 @@ export OPS_RES="C768" # Do not change
 export LEVS=128
 export CASE="{{ CASE_CTL }}"  # CASE is required in GEFS to determine ocean/ice/wave resolutions
 export CASE_ENS="{{ CASE_ENS }}"
+export CASE_HIST="{{ CASE_HIST | default('${CASE}') }}"
 export OCNRES="{{ OCNRES }}"
 export ICERES="${OCNRES}"
 # These are the currently recommended grid-combinations
diff --git a/dev/parm/config/gfs/config.base.j2 b/dev/parm/config/gfs/config.base.j2
@@ -200,6 +200,7 @@ export OPS_RES="C768" # Do not change # TODO: Why is this needed and where is it
 export LEVS=128
 export CASE="{{ CASE_CTL }}"
 export CASE_ENS="{{ CASE_ENS }}"
+export CASE_HIST="{{ CASE_HIST | default('${CASE}') }}"
 export OCNRES="{{ OCNRES }}"
 export ICERES="${OCNRES}"
 
diff --git a/dev/parm/config/gfs/config.efcs b/dev/parm/config/gfs/config.efcs
@@ -6,6 +6,7 @@
 echo "BEGIN: config.efcs"
 
 export CASE="${CASE_ENS}"
+export CASE_HIST="${CASE_ENS}"
 
 # Source model specific information that is resolution dependent
 string="--fv3 ${CASE}"
diff --git a/dev/parm/config/gfs/config.resources b/dev/parm/config/gfs/config.resources
@@ -994,9 +994,11 @@ case ${step} in
     ;;
 
   "upp")
-    case "${CASE}" in
+    #ntasks cannot be greater than $CASE_HIST      
+    #define resources based on $CASE_HIST for upp
+    case "${CASE_HIST}" in
       "C48" | "C96")
-        ntasks=${CASE:1}
+        ntasks=${CASE_HIST:1}
       ;;
       "C192" | "C384" | "C768")
         ntasks=120
@@ -1007,12 +1009,12 @@ case ${step} in
         memory="${mem_node_max}"
       ;;
       *)
-        echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE}"
+        echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE_HIST}"
         exit 4
       ;;
     esac
     tasks_per_node=${ntasks}
-    if [[ "${CASE}" == "C1152" ]]; then
+    if [[ "${CASE_HIST}" == "C1152" ]]; then
         tasks_per_node=40
     fi
 
@@ -1304,7 +1306,7 @@ case ${step} in
     walltime="00:20:00"
     ntasks=80
     threads_per_task=4
-    if [[ "${CASE}" == "C384" || "${CASE}" == "C192" || "${CASE}" == "C96" || "${CASE}" == "C48" ]]; then
+    if [[ "${CASE:1}" -le 384 ]]; then
       threads_per_task=2
     fi
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
diff --git a/dev/parm/config/sfs/config.base.j2 b/dev/parm/config/sfs/config.base.j2
@@ -149,6 +149,7 @@ export OPS_RES="C768" # Do not change
 export LEVS=128
 export CASE="{{ CASE_CTL }}"  # CASE is required in SFS to determine ocean/ice/wave resolutions
 export CASE_ENS="{{ CASE_ENS }}"
+export CASE_HIST="{{ CASE_HIST | default('${CASE}') }}"
 export OCNRES="{{ OCNRES }}"
 export ICERES="${OCNRES}"
 # These are the currently recommended grid-combinations
diff --git a/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC b/jobs/JGLOBAL_ATMOS_TROPCY_QC_RELOC
@@ -25,7 +25,7 @@ if [[ ! -d "${COMOUT_OBS}" ]]; then
   mkdir -p "${COMOUT_OBS}"
 fi
 
-export CRES=$(echo ${CASE} | cut -c2-)
+export CRES=${CASE_HIST:1}
 export LATB=$((CRES*2))
 export LONB=$((CRES*4))
 export BKGFREQ=1                                # for hourly relocation
diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh
@@ -260,7 +260,7 @@ else
 fi
 
 # Get dimension information based on CASE
-res=$(echo ${CASE} | cut -c2-)
+res=${CASE_HIST:1}
 JCAP_CASE=$((res*2-2))
 LATB_CASE=$((res*2))
 LONB_CASE=$((res*4))
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
@@ -217,6 +217,7 @@ FV3_predet(){
   # changeable parameters
   # dycore definitions
   res="${CASE:1}"
+  resh="${CASE_HIST:1}"
   resp=$((res+1))
   npx=${resp}
   npy=${resp}
@@ -229,12 +230,16 @@ FV3_predet(){
   LONB_CASE=$((4*res))
   LATB_CASE=$((2*res))
 
+  JCAP_CASE_HIST=$((2*resh-2))
+  LONB_CASE_HIST=$((4*resh))
+  LATB_CASE_HIST=$((2*resh))
+
   JCAP=${JCAP:-${JCAP_CASE}}
   LONB=${LONB:-${LONB_CASE}}
   LATB=${LATB:-${LATB_CASE}}
 
-  LONB_IMO=${LONB_IMO:-${LONB_CASE}}
-  LATB_JMO=${LATB_JMO:-${LATB_CASE}}
+  LONB_IMO=${LONB_IMO:-${LONB_CASE_HIST}}
+  LATB_JMO=${LATB_JMO:-${LATB_CASE_HIST}}
 
   # NSST Options
   # nstf_name contains the NSST related parameters
diff --git a/ush/gaussian_sfcanl.sh b/ush/gaussian_sfcanl.sh
@@ -9,7 +9,9 @@
 # Author:        George Gayno       Org: NP23         Date: 2018-01-30
 #
 # Abstract: This script makes a global gaussian grid surface analysis from
-#           fv3gfs surface analysis tiles
+#           fv3gfs surface analysis tiles.  The gaussian grid resolution is
+#           the gaussian equivalent of the history file resolution (may be
+#           different than restart resolution).
 #
 # Script history log:
 # 2018-01-30  Gayno  initial script
@@ -18,7 +20,8 @@
 # Usage:  gaussian_sfcanl.sh
 #
 #   Imported Shell Variables:
-#     CASE          Model resolution.  Defaults to C768.
+#     CASE          Forecast model and restart resolution.  Defaults to C768.
+#     CASE_HIST     History file output resolution.  Defaults to $CASE.
 #     DONST         Process NST fields when 'yes'.  Default is 'no'.
 #     OUTPUT_FILE   Output gaussian analysis file format.  Default is "nemsio"
 #                   Set to "netcdf" for netcdf output file
@@ -97,9 +100,10 @@
 ################################################################################
 
 CASE=${CASE:-C768}
-res=$(echo $CASE | cut -c2-)
-LONB_CASE=$((res*4))
-LATB_CASE=$((res*2))
+CASE_HIST=${CASE_HIST:-${CASE}}
+resh=${CASE_HIST:1}
+LONB_CASE=$((resh*4))
+LATB_CASE=$((resh*2))
 LONB_SFC=${LONB_SFC:-$LONB_CASE}
 LATB_SFC=${LATB_SFC:-$LATB_CASE}
 DONST=${DONST:-"NO"}
diff --git a/ush/gfs_bufr.sh b/ush/gfs_bufr.sh
@@ -47,6 +47,8 @@ fi
 
 # check if read in bufr_ij_gfs_${CASE}.txt 
 
+export CASE=${CASE_HIST:-${CASE}}
+
 if [[ -s "${PARMgfs}/product/bufr_ij_gfs_${CASE}.txt"  ]]; then
   # use predetermined grid point(i,j) in bufr_gfs_${CASE}.txt 
   ${NLN} "${PARMgfs}/product/bufr_ij_gfs_${CASE}.txt" fort.7
diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh
@@ -5,7 +5,7 @@
 # shellcheck disable=SC2034
 FV3_model_configure(){
 
-local restile=${CASE:1}
+local restile=${CASE_HIST:1}
 
 # Prepare local variables for use in model_configure.IN from UFSWM
 # The ones already defined are left commented as a reminder
