test

NCAR · Apr 11, 2024 · c43c020 · c43c020
1 parent eb1ecfd
commit c43c020
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         # configuration: [nwm_ana, nwm_long_range, gridded, reach]
-        configuration: [nwm_ana]
+        configuration: [gridded] # gridded-no-lakes, nwm, reach, reach-lakes
     runs-on: ubuntu-latest
 
     env:
@@ -160,22 +160,32 @@ jobs:
           cmake -B build
           make -C build -j
 
-      - name: Get and Extract Testcase
+      # - name: Get and Extract Testcase
+      #   run: |
+      #     wget -q -O $GITHUB_WORKSPACE/croton_NY_training_example_v5.2.tar.gz https://github.com/NCAR/wrf_hydro_nwm_public/releases/download/v5.2.0/croton_NY_training_example_v5.2.tar.gz
+      #     ls $GITHUB_WORKSPACE/croton_NY_training_example_v5.2.tar.gz
+      #     tar zxf $GITHUB_WORKSPACE/croton_NY_training_example_v5.2.tar.gz -C $HOME
+
+      - name: Run Reference Command
         run: |
-          wget -q -O $GITHUB_WORKSPACE/croton_NY_training_example_v5.2.tar.gz https://github.com/NCAR/wrf_hydro_nwm_public/releases/download/v5.2.0/croton_NY_training_example_v5.2.tar.gz
-          ls $GITHUB_WORKSPACE/croton_NY_training_example_v5.2.tar.gz
-          tar zxf $GITHUB_WORKSPACE/croton_NY_training_example_v5.2.tar.gz -C $HOME
+          cd $GITHUB_WORKSPACE/reference/build/Run
+          make croton-${{ matrix.configuration }}
+          make run
 
-      - name: Run Testing Command
+      - name: Run Candidate Command
         run: |
-          python $GITHUB_WORKSPACE/candidate/tests/local/run_tests.py \
-            --compiler gfort \
-            --output_dir $GITHUB_WORKSPACE/test_out \
-            --candidate_dir $GITHUB_WORKSPACE/candidate \
-            --reference_dir $GITHUB_WORKSPACE/reference \
-            --domain_dir $GITHUB_WORKSPACE/example_case \
-            --config ${{ matrix.configuration }} --domain_tag dev \
-            --print
+          cd $GITHUB_WORKSPACE/candidate/build/Run
+          make croton-${{ matrix.configuration }}
+          make run
+
+          # python $GITHUB_WORKSPACE/candidate/tests/local/run_tests.py \
+          #   --compiler gfort \
+          #   --output_dir $GITHUB_WORKSPACE/test_out \
+          #   --candidate_dir $GITHUB_WORKSPACE/candidate \
+          #   --reference_dir $GITHUB_WORKSPACE/reference \
+          #   --domain_dir $GITHUB_WORKSPACE/example_case \
+          #   --config ${{ matrix.configuration }} --domain_tag dev \
+          #   --print
 
 
       # ADD BACK IN AFTER DEBUGGING
@@ -194,7 +204,6 @@ jobs:
       #     cd $GITHUB_WORKSPACE/candidate/tests/local/utils
       #     bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }}
 
-
       # - name: Archive test results to GitHub
       #   if: ${{ always() }}
       #   uses: actions/upload-artifact@v3