update the build system to support standalone networks

this allows us to output a network outside of Microphysics/networks/
and initiate a build there.  This will be used to support pynucastro
unit tests / comparsions to other pynucastro nets

Author: zingale

Make.Microphysics

@@ -119,7 +119,7 @@ ifdef MICROPHYSICS_HOME
 endif
 
 EXTERN_PARAMETERS := $(shell $(MICROPHYSICS_HOME)/util/build_scripts/findparams.py $(EXTERN_SEARCH))
-
+EXTERN_PARAMETERS += $(CUSTOM_PARAMETERS)
 
 $(MICROPHYSICS_AUTO_SOURCE_DIR)/extern_parameters.cpp: $(MICROPHYSICS_AUTO_SOURCE_DIR)/extern_parameters.H
 

Make.Microphysics_extern

@@ -66,7 +66,11 @@ endif
 
 
 EOS_PATH := $(MICROPHYSICS_HOME)/EOS/$(strip $(EOS_DIR))
-NETWORK_PATH := $(MICROPHYSICS_HOME)/networks/$(strip $(NETWORK_DIR))
+ifneq ($(NETWORK_CUSTOM_PATH),)
+    NETWORK_PATH := $(NETWORK_CUSTOM_PATH)
+else
+    NETWORK_PATH := $(MICROPHYSICS_HOME)/networks/$(strip $(NETWORK_DIR))
+endif
 ifeq ($(USE_CONDUCTIVITY), TRUE)
    CONDUCTIVITY_PATH := $(MICROPHYSICS_HOME)/conductivity/$(strip $(CONDUCTIVITY_DIR))
 endif

networks/Make.package

@@ -90,13 +90,18 @@ AUTO_BUILD_SOURCES += $(NETWORK_OUTPUT_PATH)/network_properties.H
 net_prop_debug: $(NETWORK_OUTPUT_PATH)/network_properties.H
 
 ifneq ($(NETWORK_DIR), general_null)
-  NAUX := $(shell PYTHONPATH=$(MICROPHYSICS_HOME)/networks/general_null $(MICROPHYSICS_HOME)/networks/get_naux.py --microphysics_path "$(MICROPHYSICS_HOME)" --defines "$(DEFINES)" --net "$(NETWORK_DIR)")
+  NAUX := $(shell PYTHONPATH=$(MICROPHYSICS_HOME)/networks/general_null $(MICROPHYSICS_HOME)/networks/get_naux.py \
+                 --microphysics_path "$(MICROPHYSICS_HOME)" \
+                 --defines "$(DEFINES)" \
+                 --net "$(NETWORK_DIR)" \
+                 --net-custom-path "$(NETWORK_CUSTOM_PATH)")
   DEFINES += "-DNAUX_NET=$(NAUX)"
 
 $(NETWORK_OUTPUT_PATH)/network_properties.H:
 	PYTHONPATH=$(MICROPHYSICS_HOME)/networks/general_null $(MICROPHYSICS_HOME)/networks/update_headers.py \
            --microphysics_path $(MICROPHYSICS_HOME) \
-           --net $(NETWORK_DIR) \
+           --net "$(NETWORK_DIR)" \
+           --net-custom-path "$(NETWORK_CUSTOM_PATH)" \
            --odir $(NETWORK_OUTPUT_PATH) \
            --defines "$(DEFINES)"
 

networks/general_null/network_param_file.py

@@ -76,7 +76,7 @@ def parse(species, extra_species, aux_vars, net_file, defines):
     try:
         f = open(net_file)
     except OSError:
-        sys.exit(f"write_network.py: ERROR: file {net_file} does not exist")
+        sys.exit(f"network_param_file.py: ERROR: file {net_file} does not exist")
 
     line = get_next_line(f)
 

networks/general_null/write_network.py

@@ -62,7 +62,7 @@ def write_network(header_template,
         try:
             template = open(tmp)
         except OSError:
-            sys.exit(f"write_network.py: ERROR: file {tmp} does not exist")
+            sys.exit(f"write_network.py: ERROR: template file {tmp} does not exist")
         else:
             template_lines = template.readlines()
             template.close()

networks/get_naux.py

@@ -2,6 +2,7 @@
 
 import os
 import argparse
+from pathlib import Path
 
 from general_null import network_param_file
 
@@ -30,15 +31,22 @@ def main():
                         help="path to Microphysics/")
     parser.add_argument("--net", type=str, default="",
                         help="name of the network")
+    parser.add_argument("--net-custom-path", type=str, default="",
+                        help="full path to the network if it lives outside of Microphysics")
 
     args = parser.parse_args()
 
     micro_path = args.microphysics_path
     net = args.net
 
-    net_file = os.path.join(micro_path, "networks", net, f"{net}.net")
-    if not os.path.isfile(net_file):
-        net_file = os.path.join(micro_path, "networks", net, "pynucastro.net")
+    if args.net_custom_path is None:
+        base_path = Path(micro_path) / "networks" / "net"
+    else:
+        base_path = Path(args.net_custom_path)
+
+    net_file = base_path / "pynucastro.net"
+    if not net_file.exists() and len(net) > 0:
+        net_file = base_path / f"{net}.net"
 
     get_naux(net_file, args.defines)
 

networks/update_headers.py

@@ -2,6 +2,7 @@
 
 import os
 import argparse
+from pathlib import Path
 
 from general_null import write_network
 
@@ -13,6 +14,8 @@ def main():
                         help="path to Microphysics/")
     parser.add_argument("--net", type=str, default="",
                         help="name of the network")
+    parser.add_argument("--net-custom-path", type=str, default="",
+                        help="full path to the network if it lives outside of Microphysics")
     parser.add_argument("--odir", type=str, default="",
                         help="output directory")
     parser.add_argument("--defines", type=str, default="",
@@ -23,9 +26,15 @@ def main():
     micro_path = args.microphysics_path
     net = args.net
 
-    net_file = os.path.join(micro_path, "networks", net, f"{net}.net")
-    if not os.path.isfile(net_file):
-        net_file = os.path.join(micro_path, "networks", net, "pynucastro.net")
+
+    if args.net_custom_path is None:
+        base_path = Path(micro_path) / "networks" / "net"
+    else:
+        base_path = Path(args.net_custom_path)
+
+    net_file = base_path / "pynucastro.net"
+    if not net_file.exists() and len(net) > 0:
+        net_file = base_path / f"{net}.net"
 
     cxx_template = os.path.join(micro_path, "networks",
                                 "general_null/network_header.template")
@@ -36,6 +45,7 @@ def main():
     except FileExistsError:
         pass
 
+    print(f"calling with {cxx_template}, {net_file}")
     write_network.write_network(cxx_template,
                                 net_file,
                                 cxx_name, args.defines)