net: port to new build system

MESAHub · Dec 29, 2024 · 15f3597 · 15f3597
1 parent 3be80d1
commit 15f3597
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 301 deletions.
diff --git a/install b/install
@@ -335,8 +335,6 @@ function do_input_data {
 	cd ..
 }
 
-do_one_parallel net
-
 if [ ! -r data/ionization_data ]
 then
 	do_input_data ionization

diff --git a/make/subdirs.mk b/make/subdirs.mk
@@ -1 +1 @@
-SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos forum colors rates neu gyre kap
+SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos forum colors rates neu net gyre kap
diff --git a/net/Makefile b/net/Makefile
@@ -0,0 +1,33 @@
+include ../make/defaults-module.mk
+
+# Build
+
+MODULE_NAME := net
+SRCS := public/net_def.f90 \
+        public/net_lib.f90 \
+        private/net_screen.f90 \
+        private/net_derivs_support.f90 \
+        private/net_derivs.f90 \
+        private/net_approx21.f90 \
+        private/net_burn_support.f90 \
+        private/net_initialize.f90 \
+        private/net_eval.f90 \
+        private/net_burn.f90 \
+        private/net_burn_const_density.f90 \
+        private/net_burn_const_p.f90
+SRCS_CHECK := test/src/test_net.f90
+INTERNAL_DEPENDS_ON := const utils math mtx num chem rates interp_1d eos
+EXTERNAL_DEPENDS_ON :=
+BINTYPE := static-lib
+
+# Testing
+
+CHECK_RESULTS_GOLDEN := test/test_output
+
+# Install
+
+MODULES := net_def.mod net_lib.mod
+INSTALL_INCLUDES := public/burner_const_density_get_eos_info.inc \
+                    public/burner_finish_substep.inc
+
+include $(MAKE_DIR)/Makefile
diff --git a/net/build_and_test b/net/build_and_test
diff --git a/net/build_and_test_parallel b/net/build_and_test_parallel
diff --git a/net/clean b/net/clean
diff --git a/net/export b/net/export
diff --git a/net/i1 b/net/i1
diff --git a/net/i1p b/net/i1p
diff --git a/net/make/makefile b/net/make/makefile
diff --git a/net/make/makefile_base b/net/make/makefile_base
diff --git a/net/mk b/net/mk
diff --git a/net/test/ck b/net/test/ck
diff --git a/net/test/clean b/net/test/clean
diff --git a/net/test/cleanup b/net/test/cleanup
diff --git a/net/test/export b/net/test/export
diff --git a/net/test/make/makefile b/net/test/make/makefile
diff --git a/net/test/make/makefile_base b/net/test/make/makefile_base
diff --git a/net/test/mk b/net/test/mk
diff --git a/net/test/mkx b/net/test/mkx
diff --git a/net/test/rn b/net/test/rn
diff --git a/touch b/touch
@@ -24,7 +24,6 @@ do_one astero
 do_one atm
 do_one binary
 do_one ionization
-do_one net
 do_one sample
 do_one star
 do_one star_data
-Original file line number
+Diff line change
@@ Expand Up / @@ -335,8 +335,6 @@ function do_input_data { @@
     	cd ..
     }
-    do_one_parallel net
     if [ ! -r data/ionization_data ]
     then
     	do_input_data ionization
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos forum colors rates neu gyre kap
		SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos forum colors rates neu net gyre kap