From 2e15f642c10825368c1f40b1926404b589d73253 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 14 Jan 2025 08:38:10 -0500 Subject: [PATCH 1/3] remove some old Fortran stuff from the build system --- Make.Microphysics | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/Make.Microphysics b/Make.Microphysics index 3cfab8b61..29cb49e3a 100644 --- a/Make.Microphysics +++ b/Make.Microphysics @@ -51,14 +51,6 @@ build_status: --git_names "Microphysics AMReX" \ --git_dirs "$(TOP) $(AMREX_HOME)" -starkiller_library: $(executable) -ifeq ($(USE_COMPILE_WITH_F2PY), TRUE) - @echo Wrapping sources with f90wrap ... - sh dowrap.sh - @echo Linking objects with f2py ... - sh dof2py.sh -endif - # Use a coarse grained OMP approach DEFINES += -DCRSEGRNDOMP @@ -213,20 +205,9 @@ $(objEXETempDir)/AMReX_buildInfo.o: .FORCE include $(AMREX_HOME)/Tools/GNUMake/Make.rules clean:: - $(SILENT) $(RM) extern.F90 - $(SILENT) $(RM) network_properties.F90 network_properties.H - $(SILENT) $(RM) $(MICROPHYSICS_AUTO_SOURCE_DIR)/*.H $(MICROPHYSICS_AUTO_SOURCE_DIR)/*.[fF]90 - $(SILENT) $(RM) extern_parameters.cpp extern_parameters_F.H extern_parameters.H - -# Older versions of CASTRO generated a "network.f90" file when using -# the general_null network, which conflicts with our generalized -# network.f90 file. So we should delete the local copy if we are -# trying to rebuild from an old directory. -# The same is true for "extern.f90". - -clean:: - $(RM) network.f90 - $(RM) extern.f90 + $(SILENT) $(RM) network_properties.H + $(SILENT) $(RM) $(MICROPHYSICS_AUTO_SOURCE_DIR)/*.H + $(SILENT) $(RM) extern_parameters.cpp extern_parameters.H # for debugging. To see the value of a Makefile variable, From 86dc5de9363632b5a8c3cdd43b44ed63817ff711 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 14 Jan 2025 08:43:05 -0500 Subject: [PATCH 2/3] remove target --- Make.Microphysics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.Microphysics b/Make.Microphysics index 29cb49e3a..93718864e 100644 --- a/Make.Microphysics +++ b/Make.Microphysics @@ -43,7 +43,7 @@ include $(AMREX_HOME)/Tools/GNUMake/Make.defs MICROPHYSICS_AUTO_SOURCE_DIR := $(TmpBuildDir)/microphysics_sources/$(optionsSuffix).EXE -all: build_status $(executable) starkiller_library +all: build_status $(executable) @echo SUCCESS build_status: From d541ea34479c483a76fe3832e3905afb7534b36d Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 13 Feb 2025 08:30:23 -0500 Subject: [PATCH 3/3] another instance --- Make.Microphysics | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Make.Microphysics b/Make.Microphysics index 93718864e..2d545be6a 100644 --- a/Make.Microphysics +++ b/Make.Microphysics @@ -75,10 +75,6 @@ ifeq ($(USE_REACT_SPARSE_JACOBIAN), TRUE) endif endif -ifeq ($(USE_COMPILE_WITH_F2PY), TRUE) - DEFINES += -DCOMPILE_WITH_F2PY -endif - #------------------------------------------------------------------------------ # AMReX