remove some remaining USE_FORT_MICROPHYSICS (#878)

AMReX-Astro · Jan 28, 2022 · a812503 · a812503
1 parent 1a290c7
commit a812503
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 126 deletions.
diff --git a/Make.Microphysics b/Make.Microphysics
@@ -1,8 +1,6 @@
 AMREX_HOME ?= /path/to/amrex
 MICROPHYSICS_HOME ?= /path/to/Castro
 
-USE_FORT_MICROPHYSICS ?= FALSE
-
 # default is not to compile with CUDA
 USE_CUDA ?= FALSE
 
@@ -145,12 +143,6 @@ INCLUDE_LOCATIONS += $(MICROPHYSICS_AUTO_SOURCE_DIR)
 # runtime parameters
 #------------------------------------------------------------------------------
 
-# runtime parameter support for extern/ routines
-ifeq ($(USE_FORT_MICROPHYSICS), TRUE)
-  F90EXE_sources += extern.F90
-  FEXE_headers += extern_parameters_F.H
-endif
-
 CEXE_sources += extern_parameters.cpp
 CEXE_headers += extern_parameters.H
 

diff --git a/Make.Microphysics_extern b/Make.Microphysics_extern
@@ -1,11 +1,6 @@
 # This is the main include makefile for applications that want to use Microphysics
 # You should set NETWORK_OUTPUT_PATH before including this file
 
-USE_FORT_MICROPHYSICS ?= TRUE
-ifeq ($(USE_FORT_MICROPHYSICS), TRUE)
-  DEFINES += -DMICROPHYSICS_FORT
-endif
-
 ifeq ($(USE_SIMPLIFIED_SDC), TRUE)
   DEFINES += -DSIMPLIFIED_SDC
 else ifeq ($(USE_TRUE_SDC), TRUE)

diff --git a/constants/Make.package b/constants/Make.package
@@ -1,4 +1 @@
-ifeq ($(USE_FORT_MICROPHYSICS), TRUE)
-  f90EXE_sources += constants_cgs.f90
-endif
 CEXE_headers += fundamental_constants.H
diff --git a/constants/constants_cgs.f90 b/constants/constants_cgs.f90
diff --git a/networks/Make.package b/networks/Make.package
@@ -90,19 +90,11 @@ net_prop_debug: $(NETWORK_OUTPUT_PATH)/network_properties.H
 ifneq ($(NETWORK_DIR), general_null)
   $(NETWORK_OUTPUT_PATH)/network_properties.F90: $(NETWORK_OUTPUT_PATH)/network_properties.H
 
-  ifeq ($(USE_FORT_MICROPHYSICS), TRUE)
-    F90EXE_sources += network_properties.F90
-  endif
-
-  ifneq ($(USE_FORT_MICROPHYSICS), TRUE)
-    net_opts := --skip_fortran
-  endif
-
   NAUX := $(shell PYTHONPATH=$(MICROPHYSICS_HOME)/networks/general_null $(MICROPHYSICS_HOME)/networks/get_naux.py --microphysics_path "$(MICROPHYSICS_HOME)" --defines "$(DEFINES)" --net "$(NETWORK_DIR)")
   DEFINES += "-DNAUX_NET=$(NAUX)"
 
 $(NETWORK_OUTPUT_PATH)/network_properties.H:
-	PYTHONPATH=$(MICROPHYSICS_HOME)/networks/general_null $(MICROPHYSICS_HOME)/networks/update_headers.py $(net_opts) \
+	PYTHONPATH=$(MICROPHYSICS_HOME)/networks/general_null $(MICROPHYSICS_HOME)/networks/update_headers.py --skip_fortran \
            --microphysics_path $(MICROPHYSICS_HOME) \
            --net $(NETWORK_DIR) \
            --odir $(NETWORK_OUTPUT_PATH) \

diff --git a/networks/general_null/Make.package b/networks/general_null/Make.package
@@ -1,10 +1,3 @@
-ifeq ($(USE_FORT_MICROPHYSICS), TRUE)
-  F90EXE_sources += actual_network.F90
-  ifeq ($(USE_REACT),TRUE)
-    F90EXE_sources += actual_rhs.F90
-  endif
-endif
-
 CEXE_headers += network_properties.H
 
 ifeq ($(USE_REACT),TRUE)
@@ -21,23 +14,15 @@ endif
 
 $(NETWORK_OUTPUT_PATH)/actual_network.F90: $(NETWORK_OUTPUT_PATH)/network_properties.H
 
-ifeq ($(USE_FORT_MICROPHYSICS), TRUE)
-  NETWORK_TEMPLATE := $(MICROPHYSICS_HOME)/networks/general_null/network.template
-  fort_opts := -t $(NETWORK_TEMPLATE) -o $(NETWORK_OUTPUT_PATH)/actual_network.F90
-else
-  NETWORK_TEMPLATE :=
-  fort_opts :=
-endif
-
 NAUX := $(shell $(MICROPHYSICS_HOME)/networks/general_null/get_naux.py --defines "$(DEFINES)" $(GENERAL_NET_INPUTS))
 DEFINES += "-DNAUX_NET=$(NAUX)"
 
-$(NETWORK_OUTPUT_PATH)/network_properties.H: $(GENERAL_NET_INPUTS) $(strip $(NETWORK_TEMPLATE))
+$(NETWORK_OUTPUT_PATH)/network_properties.H: $(GENERAL_NET_INPUTS)
 	@echo " "
 	@echo "---------------------------------------------------------------------------"
 	@echo "WRITING network files:"
 	@if [ ! -d $(NETWORK_OUTPUT_PATH) ]; then mkdir -p $(NETWORK_OUTPUT_PATH); fi
-	$(MICROPHYSICS_HOME)/networks/general_null/write_network.py $(fort_opts) \
+	$(MICROPHYSICS_HOME)/networks/general_null/write_network.py \
             -s $(GENERAL_NET_INPUTS) \
             --other_properties $(MICROPHYSICS_HOME)/networks/general_null/NETWORK_PROPERTIES \
             --header_template $(MICROPHYSICS_HOME)/networks/general_null/network_header.template \

diff --git a/unit_test/burn_cell_sdc/GNUmakefile b/unit_test/burn_cell_sdc/GNUmakefile
@@ -19,7 +19,6 @@ USE_CXX_REACTIONS = TRUE
 
 USE_EXTRA_THERMO = TRUE
 
-USE_FORT_MICROPHYSICS = FALSE
 BL_NO_FORT = TRUE
 USE_MICROPHYSICS_DEBUG = TRUE
 

diff --git a/unit_test/test_aprox_rates/GNUmakefile b/unit_test/test_aprox_rates/GNUmakefile
@@ -16,7 +16,6 @@ EBASE = main
 
 USE_EXTRA_THERMO = TRUE
 
-USE_FORT_MICROPHYSICS = FALSE
 BL_NO_FORT=TRUE
 
 # define the location of the CASTRO top directory

diff --git a/unit_test/test_eos/GNUmakefile b/unit_test/test_eos/GNUmakefile
@@ -16,7 +16,6 @@ EBASE = main
 
 USE_EXTRA_THERMO = TRUE
 
-USE_FORT_MICROPHYSICS = FALSE
 BL_NO_FORT=TRUE
 
 # define the location of the CASTRO top directory

diff --git a/unit_test/test_jac/GNUmakefile b/unit_test/test_jac/GNUmakefile
@@ -18,7 +18,6 @@ USE_EXTRA_THERMO = TRUE
 
 USE_CXX_REACTIONS = TRUE
 
-USE_FORT_MICROPHYSICS = FALSE
 BL_NO_FORT=TRUE
 
 ifeq ($(USE_CXX_REACTIONS),TRUE)

diff --git a/unit_test/test_react/GNUmakefile b/unit_test/test_react/GNUmakefile
@@ -16,7 +16,6 @@ EBASE = main
 
 USE_CXX_REACTIONS = TRUE
 
-USE_FORT_MICROPHYSICS = FALSE
 BL_NO_FORT=TRUE
 
 ifeq ($(USE_CXX_REACTIONS),TRUE)

diff --git a/unit_test/test_screening/GNUmakefile b/unit_test/test_screening/GNUmakefile
@@ -23,8 +23,6 @@ ifeq ($(USE_CXX_REACTIONS),TRUE)
   DEFINES += -DCXX_REACTIONS
 endif
 
-USE_FORT_MICROPHYSICS = FALSE
-
 # define the location of the CASTRO top directory
 MICROPHYSICS_HOME  := ../..
 

diff --git a/unit_test/test_sdc/GNUmakefile b/unit_test/test_sdc/GNUmakefile
@@ -19,7 +19,6 @@ USE_CXX_REACTIONS = TRUE
 
 USE_EXTRA_THERMO = TRUE
 
-USE_FORT_MICROPHYSICS = FALSE
 BL_NO_FORT = TRUE
 
 ifeq ($(USE_CXX_REACTIONS),TRUE)