Merge branch 'development' into remove_old_fortran_make

AMReX-Astro · Jan 14, 2025 · 9e4f552 · 9e4f552
2 parents 86dc5de + aeef432
commit 9e4f552
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 22 deletions.
diff --git a/networks/Make.package b/networks/Make.package
@@ -7,20 +7,6 @@ include $(MICROPHYSICS_UTIL_PATH)/Make.package
 
 ifeq ($(USE_REACT), TRUE)
 
-  # for backwards compatibility
-  DEFINES += -DNETWORK_HAS_CXX_IMPLEMENTATION
-
-  ifeq ($(INTEGRATOR_DIR), VODE90)
-    override INTEGRATOR_DIR = VODE
-    $(warning VODE90 has been renamed VODE)
-  endif
-
-  ifeq ($(INTEGRATOR_DIR), VODE)
-    ifeq ($(USE_CLEANED_CORRECTOR), TRUE)
-      DEFINES += -DCLEAN_INTEGRATOR_CORRECTION
-    endif
-  endif
-
   VPATH_LOCATIONS += $(MICROPHYSICS_HOME)/networks
 
   CEXE_headers += rhs.H
@@ -98,8 +84,6 @@ AUTO_BUILD_SOURCES += $(NETWORK_OUTPUT_PATH)/network_properties.H
 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
-
   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)"
 

diff --git a/unit_test/test_aprox_rates/main.cpp b/unit_test/test_aprox_rates/main.cpp
@@ -102,9 +102,6 @@ void main_main ()
     // for C++
     plot_t vars;
 
-    // for F90
-    Vector<std::string> varnames;
-
     // C++ test
     vars = init_variables();
 

diff --git a/unit_test/test_conductivity/main.cpp b/unit_test/test_conductivity/main.cpp
@@ -102,9 +102,6 @@ void main_main ()
     // for C++
     plot_t vars;
 
-    // for F90
-    Vector<std::string> varnames;
-
     // C++ test
     vars = init_variables();