Merge branch 'master' into darwin

darwinproject · Jun 29, 2023 · 7c62658 · 7c62658
2 parents 5cc91e7 + acbfbd3
commit 7c62658
Show file tree

Hide file tree

Showing 370 changed files with 100,605 additions and 2,906 deletions.
diff --git a/.github/workflows/build_testing.yml b/.github/workflows/build_testing.yml
@@ -71,7 +71,7 @@ jobs:
        env:
         MITGCM_EXP: ${{ matrix.exp }}
         MITGCM_DECMD: "docker exec -i openad-testing bash -lc"
-        MITGCM_TROPT: "-oad -devel -of=../tools/build_options/linux_amd64_gfortran"
+        MITGCM_TROPT: "-oad -devel -of=../tools/build_options/linux_amd64_gfortran -match 14"
         MITGCM_INPUT_DIR_PAT: '/input_oad.*'
        run: |
          . tools/ci/runtr.sh
@@ -107,7 +107,7 @@ jobs:
        env:
         MITGCM_EXP: ${{ matrix.exp }}
         MITGCM_DECMD: "docker exec -i openad-testing bash -lc"
-        MITGCM_TROPT: "-oad -devel -of=../tools/build_options/linux_amd64_gfortran"
+        MITGCM_TROPT: "-oad -devel -of=../tools/build_options/linux_amd64_gfortran -match 14"
         MITGCM_INPUT_DIR_PAT: '/input_oad.*'
        run: |
          . tools/ci/runtr.sh

diff --git a/.gitignore b/.gitignore
@@ -115,3 +115,4 @@ core
 
 /verification/*/tr_run.*
 
+/tools/TAP_support/ADFirstAidKit/*.gch