Merge branch 'develop' into feature/test20241001

.github/linters/.yaml-lint.yml

@@ -0,0 +1,28 @@
+---
+
+extends: default
+
+rules:
+  braces:
+    level: warning
+    max-spaces-inside: 1
+  brackets:
+    level: warning
+    max-spaces-inside: 1
+  colons:
+    level: warning
+  commas: disable
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    level: warning
+  hyphens:
+    level: warning
+  indentation:
+    level: warning
+    indent-sequences: consistent
+  line-length: disable
+  truthy: disable
+  trailing-spaces: disable
+

.github/pull_request_template.md

@@ -42,6 +42,7 @@ Please delete what is not needed.
   * MOM6 - 
   * NOAHMP - 
   * WW3 - 
+  * fire_behavior
   * stochastic_physics - 
 ```
 
@@ -89,6 +90,7 @@ Example:
 * MOM6:
 * NOAHMP:
 * WW3:
+* fire_behavior:
 * stochastic_physics:
 * None
 

.github/workflows/aux.yml

@@ -18,43 +18,42 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - name: Share helper id
-      run: echo -n ${{ github.run_id }} >~/id_file
+      - name: Share helper id
+        run: echo -n ${{ github.run_id }} >~/id_file
 
-    - uses: actions/cache@v2
-      with:
-        path: ~/id_file
-        key: helperid-${{ github.event.workflow_run.id }}
+      - uses: actions/cache@v4
+        with:
+          path: ~/id_file
+          key: helperid-${{ github.event.workflow_run.id }}
 
   repocheck:
     name: Repo check
     runs-on: ubuntu-20.04
 
     steps:
-    - name: Check up-to-dateness and post comment
-      run: |
-        trap 'echo "exit-code=$?" >> "$GITHUB_OUTPUT"' EXIT
-        head_sha=${{ github.event.pull_request.head.sha }}
-        head_brc=${{ github.event.pull_request.head.ref }}
-        head_url=${{ github.event.pull_request.head.repo.html_url }}
-        git clone -q -b $head_brc $head_url .
-        git checkout -q $head_sha
-        git submodule -q update --init --recursive
-        cd ${{ github.workspace }}/tests/ci
-        url=$GITHUB_API_URL/repos/$GITHUB_REPOSITORY
-        pr_number=$(curl -sS -H $app $url/pulls \
-          | jq -r '.[] | select(.head.sha == "'"$head_sha"'") | .number')
-        echo "pr_number is $pr_number"
-        pr_uid=${{ github.event.pull_request.head.repo.owner.login }}
-        echo "pr_uid is $pr_uid"
-        ./repo_check.sh
-        #comment="$(./repo_check.sh 2>/dev/null)"
-        #echo "comment is $comment"
-        #if [[ -n $comment ]]; then
-        #  curl -sS -X POST -H $app -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-        #    $url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
-        #  echo -n "failure" >~/repocheck_file
-        #else
-        #  echo -n "success" >~/repocheck_file
-        #fi
-        
+      - name: Check up-to-dateness and post comment
+        run: |
+          trap 'echo "exit-code=$?" >> "$GITHUB_OUTPUT"' EXIT
+          head_sha=${{ github.event.pull_request.head.sha }}
+          head_brc=${{ github.event.pull_request.head.ref }}
+          head_url=${{ github.event.pull_request.head.repo.html_url }}
+          git clone -q -b $head_brc $head_url .
+          git checkout -q $head_sha
+          git submodule -q update --init --recursive
+          cd ${{ github.workspace }}/tests/ci
+          url=$GITHUB_API_URL/repos/$GITHUB_REPOSITORY
+          pr_number=$(curl -sS -H $app $url/pulls \
+            | jq -r '.[] | select(.head.sha == "'"$head_sha"'") | .number')
+          echo "pr_number is $pr_number"
+          pr_uid=${{ github.event.pull_request.head.repo.owner.login }}
+          echo "pr_uid is $pr_uid"
+          ./repo_check.sh
+          #comment="$(./repo_check.sh 2>/dev/null)"
+          #echo "comment is $comment"
+          #if [[ -n $comment ]]; then
+          #  curl -sS -X POST -H $app -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          #    $url/issues/$pr_number/comments -d '{"body": "'"${comment}"'"}'
+          #  echo -n "failure" >~/repocheck_file
+          #else
+          #  echo -n "success" >~/repocheck_file
+          #fi

.github/workflows/build_test.yml → .github/workflows/build_test._yml

@@ -16,12 +16,12 @@ jobs:
       current: ${{ steps.check.outputs.current }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Wait for caching source
       run: sleep 30
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: ~/id_file
         key: helperid-${{ github.run_id }}

.github/workflows/superlinter.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Super-Linter
         uses: super-linter/[email protected]
         env:
-          LINTER_RULES_PATH: /
+          LINTER_RULES_PATH: '.github/linters/'
           DEFAULT_BRANCH: origin/develop
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           FILTER_REGEX_EXCLUDE: .*(tests/fv3_conf/.*|tests/ci/.*|tests/auto/.*|tests/auto-jenkins/.*|tests/opnReqTests/.*|tests/opnReqTest|tests/atparse.bash).*
@@ -33,5 +33,5 @@ jobs:
           #VALIDATE_GITHUB_ACTIONS: true
           #VALIDATE_LUA: true
           #VALIDATE_MARKDOWN: true
-          #VALIDATE_PYTHON_PYLINT: true
-          #VALIDATE_YAML: true
+          VALIDATE_PYTHON_PYLINT: true
+          VALIDATE_YAML: true

.gitignore

@@ -72,4 +72,10 @@ tests/fv3_conf/compile_slurm.IN
 tests/fv3_conf/compile_qsub.IN
 tests/fv3_conf/fv3_slurm.IN
 tests/fv3_conf/fv3_qsub.IN
+tests/rt_temp.conf
 build*.log*
+rocoto_workflow*
+fail_compile_*
+fail_test_*
+tests/run_dir
+tests/logs/log_*

CDEPS-interface/cdeps_files.cmake

@@ -41,14 +41,11 @@ list(APPEND cdeps_dshr_files
 
 list(APPEND cdeps_datm_files
   CDEPS/datm/atm_comp_nuopc.F90
-  CDEPS/datm/datm_datamode_cfsr_mod.F90
   CDEPS/datm/datm_datamode_clmncep_mod.F90
   CDEPS/datm/datm_datamode_core2_mod.F90
   CDEPS/datm/datm_datamode_cplhist_mod.F90
   CDEPS/datm/datm_datamode_era5_mod.F90
   CDEPS/datm/datm_datamode_gefs_mod.F90
-  CDEPS/datm/datm_datamode_gfs_mod.F90
-  CDEPS/datm/datm_datamode_gfs_hafs_mod.F90
   CDEPS/datm/datm_datamode_jra_mod.F90
   CDEPS/datm/datm_datamode_simple_mod.F90
 )