update convergence and nightly tests for reorged submods

baperry2 · Dec 9, 2023 · 4c99ba9 · 4c99ba9
1 parent 55d504c
commit 4c99ba9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 33 deletions.
diff --git a/.github/workflows/convergenceTesting.yml b/.github/workflows/convergenceTesting.yml
@@ -19,36 +19,28 @@ jobs:
       with:
         access_token: ${{github.token}}
     - uses: actions/checkout@v3
+      with:
+          submodules: recursive
     - name: System Dependencies
       run: |
          .github/workflows/dependencies/dependencies.sh
          sudo apt-get install -y python3-setuptools
          python3 -m pip install --user numpy
          python3 -m pip install --user argparse
          python3 -m pip install --user matplotlib
-    - name: Repo Dependencies
-      run: Utils/CloneDeps.sh
     - name: Build AMReX Tools
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-      working-directory: ./build/amrex/Tools/Plotfile
+      working-directory: ./Submodules/PelePhysics/Submodules/amrex/Tools/Plotfile
       run: |
         make
     - name: Build PeleLMeX
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME: ${GITHUB_WORKSPACE}/build/sundials
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
       working-directory: ./Exec/RegTests/PeriodicCases
       run: |
         make -j 2 TPL COMP=gnu
         make -j 2 COMP=gnu
     - name: Run
       working-directory: ./Exec/RegTests/PeriodicCases
       run: |
-        cp ${GITHUB_WORKSPACE}/build/amrex/Tools/Plotfile/fcompare.gnu.ex .
+        cp ${GITHUB_WORKSPACE}/Submodules/PelePhysics/Submodules/amrex/Tools/Plotfile/fcompare.gnu.ex .
         sed -i "34s/.*/    resolution = [32,64,128,256,512]/" multiRuns.py
         sed -i "s/mpiexec -n 1/mpiexec -n 4 --oversubscribe/g" multiRuns.py
         ./multiRuns.py --test_name GH_CI_CoVo --input_file input.2d_CoVo

diff --git a/.github/workflows/nightlyTest.yml b/.github/workflows/nightlyTest.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-          submodules: true
+          submodules: recursive
     - name: System Dependencies
       run: |
           .github/workflows/dependencies/dependencies_gcc10.sh
@@ -28,53 +28,42 @@ jobs:
     - name: LMeX Reference
       run: |
               mkdir buildRef
-              git clone --recursive -b development https://github.com/AMReX-Combustion/PeleLMeX.git buildRef/PeleLMeX
-    - name: Set Environment Variables
-      run: |
-              echo "AMREX_HOME=${{github.workspace}}/buildRef/PeleLMeX/Submodules/amrex" >> $GITHUB_ENV
-              echo "PELE_PHYSICS_HOME=${{github.workspace}}/buildRef/PeleLMeX/Submodules/PelePhysics" >> $GITHUB_ENV
-              echo "AMREX_HYDRO_HOME=${{github.workspace}}/buildRef/PeleLMeX/Submodules/AMReX-Hydro" >> $GITHUB_ENV
-              echo "SUNDIALS_HOME=${{github.workspace}}/buildRef/PeleLMeX/Submodules/sundials" >> $GITHUB_ENV
-              echo "PELELMEX_HOME=${{github.workspace}}/buildRef/PeleLMeX/" >> $GITHUB_ENV
+              git clone --recursive --single-branch --shallow-submodules -b development https://github.com/AMReX-Combustion/PeleLMeX.git buildRef/PeleLMeX
     - name: Build Reference PeleLMeX
-      working-directory: ${{env.PELELMEX_HOME}}/Exec/UnitTests/DodecaneLu
+      working-directory: ${{github.workspace}}/buildRef/PeleLMeX/Exec/UnitTests/DodecaneLu
       run: |
           make -j2 TPL COMP=gnu DEBUG=FALSE
           make -j2 COMP=gnu DEBUG=FALSE
     - name: Run Reference Case
-      working-directory: ${{env.PELELMEX_HOME}}/Exec/UnitTests/DodecaneLu
+      working-directory: ${{github.workspace}}/buildRef/PeleLMeX/Exec/UnitTests/DodecaneLu
       run: |
           ./PeleLMeX3d.gnu.MPI.ex inputs.3d
     - name: Update PeleLMeX Submodules
       working-directory: ${{github.workspace}}
       run: |
-              cd ${{github.workspace}}/Submodules/amrex
-              git checkout development
-              cd -
               cd ${{github.workspace}}/Submodules/AMReX-Hydro
               git checkout development
               cd -
               cd ${{github.workspace}}/Submodules/PelePhysics
               git checkout development
               cd -
+              cd ${{github.workspace}}/Submodules/PelePhysics/Submodules/amrex
+              git checkout development
+              cd -
     - name: Reset Environment Variables
       run: |
-              echo "AMREX_HOME=${{github.workspace}}/Submodules/amrex" >> $GITHUB_ENV
-              echo "PELE_PHYSICS_HOME=${{github.workspace}}/Submodules/PelePhysics" >> $GITHUB_ENV
-              echo "AMREX_HYDRO_HOME=${{github.workspace}}/Submodules/AMReX-Hydro" >> $GITHUB_ENV
-              echo "SUNDIALS_HOME=${{github.workspace}}/Submodules/sundials" >> $GITHUB_ENV
-              echo "PELELMEX_HOME=${{github.workspace}}" >> $GITHUB_ENV
+              echo "AMREX_HOME=${{github.workspace}}/Submodules/PelePhysics/Submodules/amrex" >> $GITHUB_ENV
     - name: Build AMReX Tools
       working-directory: ${{env.AMREX_HOME}}/Tools/Plotfile
       run: |
           make -j2 VERBOSE=FALSE
     - name: Build PeleLMeX
-      working-directory: ${{env.PELELMEX_HOME}}/Exec/UnitTests/DodecaneLu
+      working-directory:  ${{github.workspace}}/Exec/UnitTests/DodecaneLu
       run: |
           make -j2 TPL COMP=gnu DEBUG=FALSE
           make -j2 COMP=gnu DEBUG=FALSE
     - name: Run Case
-      working-directory: ${{env.PELELMEX_HOME}}/Exec/UnitTests/DodecaneLu
+      working-directory:  ${{github.workspace}}/Exec/UnitTests/DodecaneLu
       run: |
           cp ${{env.AMREX_HOME}}/Tools/Plotfile/fcompare.gnu.ex .
           ./PeleLMeX3d.gnu.MPI.ex inputs.3d