Merge branch 'development' into interp_cxx_test

AMReX-Astro · Aug 15, 2023 · 3487a52 · 3487a52
2 parents 2002749 + f981413
commit 3487a52
Show file tree

Hide file tree

Showing 32 changed files with 11 additions and 68 deletions.
diff --git a/.github/workflows/find_changed_files.py b/.github/workflows/find_changed_files.py
@@ -35,10 +35,10 @@ def find_files(SHAs=None):
     # see which directories contain changed files
     changed_networks = set()
     for f in files:
-        # check for the NETWORK_PROPERTIES file in each parent directory
+        # check for the actual_network.H file in each parent directory
         parts = f.split('/')
         while parts:
-            if os.path.exists(os.path.join(*parts, 'NETWORK_PROPERTIES')):
+            if os.path.exists(os.path.join(*parts, 'actual_network.H')):
                 # remove networks/
                 changed_networks.add(os.path.join(*parts[1:]))
                 break

diff --git a/.github/workflows/good_defines.txt b/.github/workflows/good_defines.txt
@@ -13,7 +13,6 @@ NONAKA_PLOT
 NSE
 NSE_NET
 NSE_TABLE
-NUMSCREEN
 RADIATION
 RATES
 REACTIONS

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+# 23.09
+
+  * The file NETWORK_PROPERTIES has been removed from each network,
+    as the legacy screening method is no longer used. (#1310)
+
 # 23.07
 
   * The preprocessor variable EXTRA_THERMO has been removed.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,6 @@ function(setup_target_for_microphysics_compilation network_name output_dir)
 
     set(networkfile "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/gammalaw.net")
     set(networkdir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/")
-    set(networkpropertiesfile "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/NETWORK_PROPERTIES")
     set(networkheadertemplatefile "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/network_header.template")
 
     set (gamma_law_dirs ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/util ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/util/gcem/include 
@@ -55,7 +54,6 @@ function(setup_target_for_microphysics_compilation network_name output_dir)
     #similarly, we want network_properties.H
     set(networkfile "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/primordial_chem/pynucastro.net")
     set(networkdir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/primordial_chem/")
-    set(networkpropertiesfile "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/primordial_chem/NETWORK_PROPERTIES")
     set(networkheadertemplatefile "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/network_header.template")
 
     #DO NOT change the order of the directories below!
@@ -98,7 +96,7 @@ function(setup_target_for_microphysics_compilation network_name output_dir)
 
   endif()
 
-  execute_process(COMMAND python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/write_network.py" --header_template "${networkheadertemplatefile}" --header_output "${networkpropfile}" -s "${networkfile}" --other_properties "${networkpropertiesfile}" WORKING_DIRECTORY ${output_dir}/)
+  execute_process(COMMAND python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/write_network.py" --header_template "${networkheadertemplatefile}" --header_output "${networkpropfile}" -s "${networkfile}" WORKING_DIRECTORY ${output_dir}/)
 
 endfunction()
 

diff --git a/networks/CNO_extras/NETWORK_PROPERTIES b/networks/CNO_extras/NETWORK_PROPERTIES
diff --git a/networks/ECSN/NETWORK_PROPERTIES b/networks/ECSN/NETWORK_PROPERTIES
diff --git a/networks/Make.package b/networks/Make.package
@@ -5,8 +5,6 @@ VPATH_LOCATIONS   += $(MICROPHYSICS_UTIL_PATH)
 
 include $(MICROPHYSICS_UTIL_PATH)/Make.package
 
-include $(MICROPHYSICS_HOME)/networks/$(NETWORK_DIR)/NETWORK_PROPERTIES
-
 ifeq ($(USE_REACT), TRUE)
 
   # for backwards compatibility
@@ -67,7 +65,6 @@ ifeq ($(USE_SCREENING), TRUE)
   include $(SCREEN_PATH)/Make.package
 
   DEFINES += -DSCREENING
-  DEFINES += -DNUMSCREEN=$(NSCREEN)
 
 endif
 

diff --git a/networks/aprox13/NETWORK_PROPERTIES b/networks/aprox13/NETWORK_PROPERTIES
diff --git a/networks/aprox19/NETWORK_PROPERTIES b/networks/aprox19/NETWORK_PROPERTIES
diff --git a/networks/aprox21/NETWORK_PROPERTIES b/networks/aprox21/NETWORK_PROPERTIES
diff --git a/networks/ase/NETWORK_PROPERTIES b/networks/ase/NETWORK_PROPERTIES
diff --git a/networks/general_null/Make.package b/networks/general_null/Make.package
@@ -20,7 +20,6 @@ $(NETWORK_OUTPUT_PATH)/network_properties.H: $(GENERAL_NET_INPUTS)
 	@if [ ! -d $(NETWORK_OUTPUT_PATH) ]; then mkdir -p $(NETWORK_OUTPUT_PATH); fi
 	$(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 \
             --header_output $(NETWORK_OUTPUT_PATH)/network_properties.H \
             --defines "$(DEFINES)"

diff --git a/networks/general_null/NETWORK_PROPERTIES b/networks/general_null/NETWORK_PROPERTIES
diff --git a/networks/general_null/write_network.py b/networks/general_null/write_network.py
@@ -19,7 +19,7 @@ def abort(outfile):
 
 
 def write_network(header_template,
-                  net_file, properties_file,
+                  net_file,
                   header_file, defines):
     """read through the list of species and output the new out_file
 
@@ -38,17 +38,6 @@ def write_network(header_template,
     if err:
         abort(header_file)
 
-    properties = {}
-    try:
-        with open(properties_file) as f:
-            for line in f:
-                if line.strip() == "":
-                    continue
-                key, value = line.strip().split(":=")
-                properties[key.strip()] = value.strip()
-    except FileNotFoundError:
-        print("no NETWORK_PROPERTIES found, skipping...")
-
     # write out the C++ files based on the templates
 
     templates = [(header_template, header_file, "C++")]
@@ -168,12 +157,6 @@ def write_network(header_template,
                     for n, aux in enumerate(aux_vars):
                         fout.write(f"{indent}\"{aux.name}\",   // {n} \n")
 
-                elif keyword == "PROPERTIES":
-                    if lang == "C++":
-                        for p in properties:
-                            print(p)
-                            fout.write(f"{indent}constexpr int {p} = {properties[p]};\n")
-
                 elif keyword == "SPECIES_ENUM":
                     if lang == "C++":
                         for n, spec in enumerate(species):
@@ -220,15 +203,13 @@ def main():
                         help="C++ header output file name")
     parser.add_argument("-s", type=str, default="",
                         help="network file name")
-    parser.add_argument("--other_properties", type=str, default="",
-                        help="a NETWORK_PROPERTIES file with other network properties")
     parser.add_argument("--defines", type=str, default="",
                         help="and preprocessor defines that are used in building the code")
 
     args = parser.parse_args()
 
     write_network(args.header_template,
-                  args.s, args.other_properties,
+                  args.s,
                   args.header_output, args.defines)
 
 if __name__ == "__main__":

diff --git a/networks/ignition_chamulak/NETWORK_PROPERTIES b/networks/ignition_chamulak/NETWORK_PROPERTIES
diff --git a/networks/ignition_reaclib/C-burn-simple/NETWORK_PROPERTIES b/networks/ignition_reaclib/C-burn-simple/NETWORK_PROPERTIES
diff --git a/networks/ignition_reaclib/URCA-simple/NETWORK_PROPERTIES b/networks/ignition_reaclib/URCA-simple/NETWORK_PROPERTIES
diff --git a/networks/ignition_simple/NETWORK_PROPERTIES b/networks/ignition_simple/NETWORK_PROPERTIES
diff --git a/networks/iso7/NETWORK_PROPERTIES b/networks/iso7/NETWORK_PROPERTIES
diff --git a/networks/nova/NETWORK_PROPERTIES b/networks/nova/NETWORK_PROPERTIES
diff --git a/networks/nova2/NETWORK_PROPERTIES b/networks/nova2/NETWORK_PROPERTIES
diff --git a/networks/partition_test/NETWORK_PROPERTIES b/networks/partition_test/NETWORK_PROPERTIES
diff --git a/networks/powerlaw/NETWORK_PROPERTIES b/networks/powerlaw/NETWORK_PROPERTIES
diff --git a/networks/primordial_chem/NETWORK_PROPERTIES b/networks/primordial_chem/NETWORK_PROPERTIES
diff --git a/networks/rprox/NETWORK_PROPERTIES b/networks/rprox/NETWORK_PROPERTIES
diff --git a/networks/sn160/NETWORK_PROPERTIES b/networks/sn160/NETWORK_PROPERTIES
diff --git a/networks/subch_approx/NETWORK_PROPERTIES b/networks/subch_approx/NETWORK_PROPERTIES
diff --git a/networks/subch_full/NETWORK_PROPERTIES b/networks/subch_full/NETWORK_PROPERTIES
diff --git a/networks/subch_simple/NETWORK_PROPERTIES b/networks/subch_simple/NETWORK_PROPERTIES
diff --git a/networks/triple_alpha_plus_cago/NETWORK_PROPERTIES b/networks/triple_alpha_plus_cago/NETWORK_PROPERTIES
diff --git a/networks/update_headers.py b/networks/update_headers.py
@@ -27,9 +27,6 @@ def main():
     if not os.path.isfile(net_file):
         net_file = os.path.join(micro_path, "networks", net, "pynucastro.net")
 
-    properties_file = os.path.join(micro_path, "networks",
-                                   net, "NETWORK_PROPERTIES")
-
     cxx_template = os.path.join(micro_path, "networks",
                                 "general_null/network_header.template")
     cxx_name = os.path.join(args.odir, "network_properties.H")
@@ -40,7 +37,7 @@ def main():
         pass
 
     write_network.write_network(cxx_template,
-                                net_file, properties_file,
+                                net_file,
                                 cxx_name, args.defines)
 
 

diff --git a/networks/vode_example/NETWORK_PROPERTIES b/networks/vode_example/NETWORK_PROPERTIES