Merge branch 'ufs-community:develop' into update-gaea-stack

ufs-community · Jul 7, 2023 · ed68f32 · ed68f32
2 parents cd3778f + cff6f5c
commit ed68f32
Show file tree

Hide file tree

Showing 208 changed files with 6,370 additions and 2,927 deletions.
diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile
@@ -13,7 +13,9 @@ pipeline {
         // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use')
         // Use the line below to enable the PW AWS cluster
         // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use')
-        choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
+        // Use the line below to re-enable Gaea
+        // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
+        choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
         // Allow job runner to filter based on compiler
         choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build')
         // Uncomment the following line to re-enable comprehensive tests
@@ -76,7 +78,8 @@ pipeline {
                 axes {
                     axis {
                         name 'SRW_PLATFORM'
-                        values 'cheyenne', 'gaea', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
+                        // values 'cheyenne', 'gaea', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
+                        values 'cheyenne', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
                     }
 
                     axis {
@@ -90,7 +93,8 @@ pipeline {
                     exclude {
                             axis {
                             name 'SRW_PLATFORM'
-                            values 'gaea', 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
+                            // values 'gaea', 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
+                            values 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
                         }
 
                         axis {

diff --git a/.cicd/scripts/srw_build.sh b/.cicd/scripts/srw_build.sh
@@ -27,7 +27,7 @@ fi
 # Build and install
 cd ${workspace}/tests
 set +e
-./build.sh ${platform} ${SRW_COMPILER}
+./build.sh ${platform} ${SRW_COMPILER} all
 build_exit=$?
 set -e
 cd -

diff --git a/.github/workflows/python_linter.yaml b/.github/workflows/python_linter.yaml
@@ -33,5 +33,8 @@ jobs:
       # Run python unittests
       - name: Lint the test directory
         run: |
-          export PYTHONPATH=${PWD}/ush
-          pylint --min-similarity-lines=15 --ignore-imports=yes tests/test_python/
+          ./manage_externals/checkout_externals workflow-tools
+          export PYTHONPATH=$(pwd)/ush:$(pwd)/ush/python_utils/workflow-tools:$(pwd)/ush/python_utils/workflow-tools/src
+          pylint --ignore-imports=yes tests/test_python/
+          pylint ush/create_*.py
+          pylint ush/generate_FV3LAM_wflow.py
diff --git a/.github/workflows/python_unittests.yaml b/.github/workflows/python_unittests.yaml
@@ -37,8 +37,8 @@ jobs:
       # Run python unittests
       - name: Run python unittests
         run: |
-          ./manage_externals/checkout_externals ufs-weather-model
+          ./manage_externals/checkout_externals ufs-weather-model workflow-tools
           # exclude test_retrieve_data that is tested in functional test
-          export PYTHONPATH=${PWD}/ush
+          export PYTHONPATH=$(pwd)/ush:$(pwd)/ush/python_utils/workflow-tools:$(pwd)/ush/python_utils/workflow-tools/src
           python3 -m unittest -b tests/test_python/*.py
 
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ fix/
 include/
 lib/
 share/
-modulefiles/extrn_comp_build/
 sorc/*/
 tests/WE2E/WE2E_tests_*.yaml
 tests/WE2E/*.txt
@@ -14,6 +13,7 @@ tests/WE2E/log.*
 ush/__pycache__/
 ush/config.yaml
 ush/python_utils/__pycache__/
+ush/python_utils/workflow-tools/
 ush/*.swp
 
 *.swp