Merge branch 'development' into fix_test_jac

AMReX-Astro · Jul 17, 2024 · 828dff7 · 828dff7
2 parents f1b1179 + 8fd0d4a
commit 828dff7
Show file tree

Hide file tree

Showing 70 changed files with 2,513 additions and 1,182 deletions.
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
@@ -41,8 +41,8 @@ jobs:
           make realclean
           make NETWORK_DIR=ignition_reaclib/URCA-simple USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 2
 
-      - name: compile test_ase (ase)
+      - name: compile test_nse_net (ase)
         run: |
           export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
-          cd unit_test/test_ase
+          cd unit_test/test_nse_net
           make USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 2
diff --git a/.github/workflows/nse_net.yml b/.github/workflows/nse_net.yml
@@ -26,42 +26,42 @@ jobs:
           sudo apt-get update -y -qq
           sudo apt-get -qq -y install curl cmake jq clang g++>=9.3.0
 
-      - name: Compile, test_ase (NSE_NET, ase)
+      - name: Compile, test_nse_net (NSE_NET, ase)
         run: |
-          cd unit_test/test_ase
+          cd unit_test/test_nse_net
           make realclean
           make -j 4
 
-      - name: Run test_ase (NSE_NET, ase)
+      - name: Run test_nse_net (NSE_NET, ase)
         run: |
-          cd unit_test/test_ase
+          cd unit_test/test_nse_net
           ./main3d.gnu.ex inputs_ase amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
 
       - name: Print backtrace
-        if: ${{ failure() && hashFiles('unit_test/test_ase/Backtrace.0') != '' }}
-        run: cat unit_test/test_ase/Backtrace.0
+        if: ${{ failure() && hashFiles('unit_test/test_nse_net/Backtrace.0') != '' }}
+        run: cat unit_test/test_nse_net/Backtrace.0
 
       - name: Compare to stored output (NSE_NET, ase)
         run: |
-          cd unit_test/test_ase
-          diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/ase_nse_net_unit_test.out
+          cd unit_test/test_nse_net
+          diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_unit_test.out
 
-      - name: Compile, test_ase/make_table (NSE_NET, ase, make_table)
+      - name: Compile, test_nse_net/make_table (NSE_NET, ase, make_table)
         run: |
-          cd unit_test/test_ase/make_table
+          cd unit_test/test_nse_net/make_table
           make realclean
           make -j 4
 
-      - name: Run, test_ase/make_table (NSE_NET, ase, make_table)
+      - name: Run, test_nse_net/make_table (NSE_NET, ase, make_table)
         run: |
-          cd unit_test/test_ase/make_table
+          cd unit_test/test_nse_net/make_table
           ./main3d.gnu.ex amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out
 
       - name: Print backtrace
-        if: ${{ failure() && hashFiles('unit_test/test_ase/make_table/Backtrace.0') != '' }}
-        run: cat unit_test/test_ase/make_table/Backtrace.0
+        if: ${{ failure() && hashFiles('unit_test/test_nse_net/make_table/Backtrace.0') != '' }}
+        run: cat unit_test/test_nse_net/make_table/Backtrace.0
 
       - name: Compare to stored output (NSE_NET, ase, make_table)
         run: |
-          cd unit_test/test_ase/make_table
-          diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/ase_nse_net_make_table_unit_test.out
+          cd unit_test/test_nse_net/make_table
+          diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_make_table_unit_test.out
diff --git a/.github/workflows/nse_test.yml b/.github/workflows/nse_test.yml
diff --git a/Make.Microphysics b/Make.Microphysics
@@ -118,10 +118,6 @@ Blocs += $(foreach dir, $(EXTERN_CORE), $(dir))
 
 include $(Bpack)
 
-# this is a safety from the mega-fortran attempts
-f90EXE_sources += $(ca_f90EXE_sources)
-F90EXE_sources += $(ca_F90EXE_sources)
-
 INCLUDE_LOCATIONS += $(Blocs)
 VPATH_LOCATIONS   += $(Blocs)