Merge branch 'development' into new-amu

psharda · Jul 17, 2023 · 7226ec1 · 7226ec1
2 parents 7f92d24 + 6af7154
commit 7226ec1
Show file tree

Hide file tree

Showing 17 changed files with 230 additions and 171 deletions.
diff --git a/Make.Microphysics b/Make.Microphysics
@@ -20,6 +20,7 @@ TOP := $(MICROPHYSICS_HOME)
 EOS_HOME ?= $(TOP)/EOS
 NETWORK_HOME ?= $(TOP)/networks
 CONDUCTIVITY_HOME ?= $(TOP)/conductivity
+NSE_TABULAR_HOME ?= $(TOP)/nse_tabular
 
 EBASE ?= main
 

diff --git a/Make.Microphysics_extern b/Make.Microphysics_extern
@@ -77,13 +77,15 @@ table:
 
 # NSE networks need the table
 ifeq ($(USE_NSE_TABLE),TRUE)
+  NSE_TABULAR_HOME ?= $(MICROPHYSICS_HOME)/nse_tabular
+  EXTERN_CORE += $(NSE_TABULAR_HOME)
   ifeq ($(findstring aprox19, $(NETWORK_DIR)), aprox19)
      all: nsetable
   endif
 endif
 
 nsetable:
-	@if [ ! -f nse19.tbl ]; then echo Linking nse19.tbl; ln -s $(NETWORK_PATH)/nse19.tbl .; fi
+	@if [ ! -f nse.tbl ]; then echo Linking nse.tbl; ln -s $(NETWORK_PATH)/nse.tbl .; fi
 
 
 # include the network

diff --git a/networks/aprox19/Make.package b/networks/aprox19/Make.package
@@ -10,9 +10,4 @@ ifeq ($(USE_REACT),TRUE)
   USE_SCREENING   = TRUE
   USE_NEUTRINOS   = TRUE
 
-  ifeq ($(USE_NSE_TABLE),TRUE)
-    CEXE_headers += nse_table.H
-    CEXE_headers += nse_table_check.H
-  endif
-
 endif
diff --git a/networks/aprox19/_parameters b/networks/aprox19/_parameters
@@ -1,15 +0,0 @@
-@namespace: network
-
-rho_nse      real    3.e8
-T_nse        real    3.e9
-C_nse        real    0.01
-O_nse        real    0.01
-Si_nse       real    0.01
-He_Fe_nse    real    0.88
-
-# factor (< 1) by which to relax the criteria for entering NSE.
-# This is only applied after a failed burn.
-nse_relax_factor  real   1.0
-
-# do we do tri-linear or tri-cubic interpolation on the table?
-nse_table_interp_linear   integer    1

diff --git a/networks/aprox19/actual_network.H b/networks/aprox19/actual_network.H
@@ -32,28 +32,6 @@ namespace network
     extern AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, NumSpec> mion;
 }
 
-namespace table
-{
-
-
-  constexpr int ntemp = 71;
-  constexpr int nden = 31;
-  constexpr int nye = 21;
-
-  constexpr int npts = ntemp * nden * nye;
-
-  constexpr Real dlogT = 0.02_rt;
-  constexpr Real dlogrho = 0.10_rt;
-  constexpr Real dye = 0.005_rt;
-
-  extern AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, npts> abartab;
-  extern AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, npts> ebtab;
-  extern AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, npts> wratetab;
-
-  extern AMREX_GPU_MANAGED amrex::Array2D<amrex::Real, 1, NumSpec, 1, npts> massfractab;
-
-}
-
 #ifdef NSE_NET
 namespace NSE_INDEX
 {

diff --git a/networks/aprox19/actual_network_data.cpp b/networks/aprox19/actual_network_data.cpp
@@ -10,19 +10,6 @@ namespace network
     AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, NumSpec> mion;
 }
 
-#ifdef NSE_TABLE
-namespace table
-{
-
-  AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, npts> abartab;
-  AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, npts> ebtab;
-  AMREX_GPU_MANAGED amrex::Array1D<amrex::Real, 1, npts> wratetab;
-
-  AMREX_GPU_MANAGED amrex::Array2D<amrex::Real, 1, NumSpec, 1, npts> massfractab;
-
-}
-#endif
-
 void actual_network_init()
 {
     using namespace Species;

diff --git a/networks/aprox19/nse19.tbl → networks/aprox19/nse.tbl b/networks/aprox19/nse19.tbl → networks/aprox19/nse.tbl
diff --git a/networks/aprox19/table_preprocess/rewrite.f90 b/networks/aprox19/table_preprocess/rewrite.f90
@@ -48,7 +48,7 @@ program rewrite
   ! read in table
   open(newunit=uold, file="nse19.tbl.orig")
 
-  open(newunit=unew, file="nse19.tbl")
+  open(newunit=unew, file="nse.tbl")
 
 5 format(2f12.5, 1pe12.5, 6e12.5, 19e12.5)
 

diff --git a/nse_solver/_parameters b/nse_solver/_parameters
@@ -6,4 +6,4 @@ ase_tol                 real       0.1
 nse_dx_independent      logical    .false.
 nse_molar_independent   logical    .false.
 nse_skip_molar          logical    .false.
-T_nse_net               real       -1.0
+T_nse_net               real       -1.0