From fbde2832432216e07db5d8f299044e49b29876e4 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 28 Jan 2025 09:27:29 -0500 Subject: [PATCH 1/3] rename test_nse_net -> nse_net_cell; test_part_func -> part_func_cell this is consistent with the other naming conventions that these are one-zone tests --- .github/workflows/cuda.yml | 4 +-- .github/workflows/nse_net.yml | 28 +++++++++---------- .../workflows/test_partition_functions.yml | 8 +++--- .../GNUmakefile | 0 .../Make.package | 0 .../{test_nse_net => nse_net_cell}/README.md | 0 .../_parameters | 0 .../burn_cell.H | 0 .../ci-benchmarks/nse_net_unit_test.out | 0 .../{test_nse_net => nse_net_cell}/inputs_ase | 0 .../{test_nse_net => nse_net_cell}/main.cpp | 0 .../make_table/GNUmakefile | 0 .../make_table/Make.package | 0 .../make_table/README.md | 0 .../make_table/_parameters | 0 .../make_table/burn_cell.H | 0 .../nse_net_make_table_unit_test.out | 0 .../make_table/main.cpp | 0 .../GNUmakefile | 0 .../Make.package | 0 .../_parameters | 0 .../ci-benchmarks/part_func.out | 0 .../main.cpp | 0 .../pf_cell.H | 0 24 files changed, 20 insertions(+), 20 deletions(-) rename unit_test/{test_nse_net => nse_net_cell}/GNUmakefile (100%) rename unit_test/{test_nse_net => nse_net_cell}/Make.package (100%) rename unit_test/{test_nse_net => nse_net_cell}/README.md (100%) rename unit_test/{test_nse_net => nse_net_cell}/_parameters (100%) rename unit_test/{test_nse_net => nse_net_cell}/burn_cell.H (100%) rename unit_test/{test_nse_net => nse_net_cell}/ci-benchmarks/nse_net_unit_test.out (100%) rename unit_test/{test_nse_net => nse_net_cell}/inputs_ase (100%) rename unit_test/{test_nse_net => nse_net_cell}/main.cpp (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/GNUmakefile (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/Make.package (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/README.md (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/_parameters (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/burn_cell.H (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/ci-benchmarks/nse_net_make_table_unit_test.out (100%) rename unit_test/{test_nse_net => nse_net_cell}/make_table/main.cpp (100%) rename unit_test/{test_part_func => part_func_cell}/GNUmakefile (100%) rename unit_test/{test_part_func => part_func_cell}/Make.package (100%) rename unit_test/{test_part_func => part_func_cell}/_parameters (100%) rename unit_test/{test_part_func => part_func_cell}/ci-benchmarks/part_func.out (100%) rename unit_test/{test_part_func => part_func_cell}/main.cpp (100%) rename unit_test/{test_part_func => part_func_cell}/pf_cell.H (100%) diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 0e8b2aea54..779583c71b 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -41,8 +41,8 @@ jobs: make realclean make NETWORK_DIR=ignition_reaclib/URCA-simple USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4 - - name: compile test_nse_net (ase) + - name: compile nse_net_cell (ase) run: | export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH} - cd unit_test/test_nse_net + cd unit_test/nse_net_cell make USE_CUDA=TRUE COMP=gnu USE_MPI=FALSE -j 4 diff --git a/.github/workflows/nse_net.yml b/.github/workflows/nse_net.yml index fc1124fe61..9680177f4e 100644 --- a/.github/workflows/nse_net.yml +++ b/.github/workflows/nse_net.yml @@ -26,42 +26,42 @@ jobs: sudo apt-get update -y -qq sudo apt-get -qq -y install curl cmake jq clang g++>=9.3.0 - - name: Compile, test_nse_net (NSE_NET, ase) + - name: Compile, nse_net_cell (NSE_NET, ase) run: | - cd unit_test/test_nse_net + cd unit_test/nse_net_cell make realclean make -j 4 - - name: Run test_nse_net (NSE_NET, ase) + - name: Run nse_net_cell (NSE_NET, ase) run: | - cd unit_test/test_nse_net + cd unit_test/nse_net_cell ./main3d.gnu.ex inputs_ase amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out - name: Print backtrace - if: ${{ failure() && hashFiles('unit_test/test_nse_net/Backtrace.0') != '' }} - run: cat unit_test/test_nse_net/Backtrace.0 + if: ${{ failure() && hashFiles('unit_test/nse_net_cell/Backtrace.0') != '' }} + run: cat unit_test/nse_net_cell/Backtrace.0 - name: Compare to stored output (NSE_NET, ase) run: | - cd unit_test/test_nse_net + cd unit_test/nse_net_cell diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_unit_test.out - - name: Compile, test_nse_net/make_table (NSE_NET, ase, make_table) + - name: Compile, nse_net_cell/make_table (NSE_NET, ase, make_table) run: | - cd unit_test/test_nse_net/make_table + cd unit_test/nse_net_cell/make_table make realclean make -j 4 - - name: Run, test_nse_net/make_table (NSE_NET, ase, make_table) + - name: Run, nse_net_cell/make_table (NSE_NET, ase, make_table) run: | - cd unit_test/test_nse_net/make_table + cd unit_test/nse_net_cell/make_table ./main3d.gnu.ex amrex.fpe_trap_{invalid,zero,overflow}=1 > test.out - name: Print backtrace - if: ${{ failure() && hashFiles('unit_test/test_nse_net/make_table/Backtrace.0') != '' }} - run: cat unit_test/test_nse_net/make_table/Backtrace.0 + if: ${{ failure() && hashFiles('unit_test/nse_net_cell/make_table/Backtrace.0') != '' }} + run: cat unit_test/nse_net_cell/make_table/Backtrace.0 - name: Compare to stored output (NSE_NET, ase, make_table) run: | - cd unit_test/test_nse_net/make_table + cd unit_test/nse_net_cell/make_table diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/nse_net_make_table_unit_test.out diff --git a/.github/workflows/test_partition_functions.yml b/.github/workflows/test_partition_functions.yml index 2752920610..8099a19721 100644 --- a/.github/workflows/test_partition_functions.yml +++ b/.github/workflows/test_partition_functions.yml @@ -28,17 +28,17 @@ jobs: - name: Compile run: | - cd unit_test/test_part_func + cd unit_test/part_func_cell make clean make -j 4 - - name: Run test_part_func + - name: Run part_func_cell run: | - cd unit_test/test_part_func + cd unit_test/part_func_cell ./main3d.gnu.ex > test.out - name: Compare to stored output run: | - cd unit_test/test_part_func + cd unit_test/part_func_cell diff -I "^Initializing AMReX" -I "^AMReX" -I "^reading in reaclib rates" test.out ci-benchmarks/part_func.out diff --git a/unit_test/test_nse_net/GNUmakefile b/unit_test/nse_net_cell/GNUmakefile similarity index 100% rename from unit_test/test_nse_net/GNUmakefile rename to unit_test/nse_net_cell/GNUmakefile diff --git a/unit_test/test_nse_net/Make.package b/unit_test/nse_net_cell/Make.package similarity index 100% rename from unit_test/test_nse_net/Make.package rename to unit_test/nse_net_cell/Make.package diff --git a/unit_test/test_nse_net/README.md b/unit_test/nse_net_cell/README.md similarity index 100% rename from unit_test/test_nse_net/README.md rename to unit_test/nse_net_cell/README.md diff --git a/unit_test/test_nse_net/_parameters b/unit_test/nse_net_cell/_parameters similarity index 100% rename from unit_test/test_nse_net/_parameters rename to unit_test/nse_net_cell/_parameters diff --git a/unit_test/test_nse_net/burn_cell.H b/unit_test/nse_net_cell/burn_cell.H similarity index 100% rename from unit_test/test_nse_net/burn_cell.H rename to unit_test/nse_net_cell/burn_cell.H diff --git a/unit_test/test_nse_net/ci-benchmarks/nse_net_unit_test.out b/unit_test/nse_net_cell/ci-benchmarks/nse_net_unit_test.out similarity index 100% rename from unit_test/test_nse_net/ci-benchmarks/nse_net_unit_test.out rename to unit_test/nse_net_cell/ci-benchmarks/nse_net_unit_test.out diff --git a/unit_test/test_nse_net/inputs_ase b/unit_test/nse_net_cell/inputs_ase similarity index 100% rename from unit_test/test_nse_net/inputs_ase rename to unit_test/nse_net_cell/inputs_ase diff --git a/unit_test/test_nse_net/main.cpp b/unit_test/nse_net_cell/main.cpp similarity index 100% rename from unit_test/test_nse_net/main.cpp rename to unit_test/nse_net_cell/main.cpp diff --git a/unit_test/test_nse_net/make_table/GNUmakefile b/unit_test/nse_net_cell/make_table/GNUmakefile similarity index 100% rename from unit_test/test_nse_net/make_table/GNUmakefile rename to unit_test/nse_net_cell/make_table/GNUmakefile diff --git a/unit_test/test_nse_net/make_table/Make.package b/unit_test/nse_net_cell/make_table/Make.package similarity index 100% rename from unit_test/test_nse_net/make_table/Make.package rename to unit_test/nse_net_cell/make_table/Make.package diff --git a/unit_test/test_nse_net/make_table/README.md b/unit_test/nse_net_cell/make_table/README.md similarity index 100% rename from unit_test/test_nse_net/make_table/README.md rename to unit_test/nse_net_cell/make_table/README.md diff --git a/unit_test/test_nse_net/make_table/_parameters b/unit_test/nse_net_cell/make_table/_parameters similarity index 100% rename from unit_test/test_nse_net/make_table/_parameters rename to unit_test/nse_net_cell/make_table/_parameters diff --git a/unit_test/test_nse_net/make_table/burn_cell.H b/unit_test/nse_net_cell/make_table/burn_cell.H similarity index 100% rename from unit_test/test_nse_net/make_table/burn_cell.H rename to unit_test/nse_net_cell/make_table/burn_cell.H diff --git a/unit_test/test_nse_net/make_table/ci-benchmarks/nse_net_make_table_unit_test.out b/unit_test/nse_net_cell/make_table/ci-benchmarks/nse_net_make_table_unit_test.out similarity index 100% rename from unit_test/test_nse_net/make_table/ci-benchmarks/nse_net_make_table_unit_test.out rename to unit_test/nse_net_cell/make_table/ci-benchmarks/nse_net_make_table_unit_test.out diff --git a/unit_test/test_nse_net/make_table/main.cpp b/unit_test/nse_net_cell/make_table/main.cpp similarity index 100% rename from unit_test/test_nse_net/make_table/main.cpp rename to unit_test/nse_net_cell/make_table/main.cpp diff --git a/unit_test/test_part_func/GNUmakefile b/unit_test/part_func_cell/GNUmakefile similarity index 100% rename from unit_test/test_part_func/GNUmakefile rename to unit_test/part_func_cell/GNUmakefile diff --git a/unit_test/test_part_func/Make.package b/unit_test/part_func_cell/Make.package similarity index 100% rename from unit_test/test_part_func/Make.package rename to unit_test/part_func_cell/Make.package diff --git a/unit_test/test_part_func/_parameters b/unit_test/part_func_cell/_parameters similarity index 100% rename from unit_test/test_part_func/_parameters rename to unit_test/part_func_cell/_parameters diff --git a/unit_test/test_part_func/ci-benchmarks/part_func.out b/unit_test/part_func_cell/ci-benchmarks/part_func.out similarity index 100% rename from unit_test/test_part_func/ci-benchmarks/part_func.out rename to unit_test/part_func_cell/ci-benchmarks/part_func.out diff --git a/unit_test/test_part_func/main.cpp b/unit_test/part_func_cell/main.cpp similarity index 100% rename from unit_test/test_part_func/main.cpp rename to unit_test/part_func_cell/main.cpp diff --git a/unit_test/test_part_func/pf_cell.H b/unit_test/part_func_cell/pf_cell.H similarity index 100% rename from unit_test/test_part_func/pf_cell.H rename to unit_test/part_func_cell/pf_cell.H From 61ec6a6035fd356ad96b703ae1a526b0e0611ca2 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 28 Jan 2025 09:29:22 -0500 Subject: [PATCH 2/3] update docs --- Docs/source/unit_tests.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Docs/source/unit_tests.rst b/Docs/source/unit_tests.rst index 5a36b2c4af..adba5a8085 100644 --- a/Docs/source/unit_tests.rst +++ b/Docs/source/unit_tests.rst @@ -115,7 +115,7 @@ by options in the input file. One-zone tests ============== -.. index:: burn_cell, burn_cell_primordial_chem, burn_cell_sdc, eos_cell, jac_cell, nse_table_cell, test_ase, test_part_func +.. index:: burn_cell, burn_cell_primordial_chem, burn_cell_sdc, eos_cell, jac_cell, nse_table_cell, nse_net_cell, part_func_cell * ``burn_cell`` : @@ -147,13 +147,13 @@ One-zone tests given a $\rho$, $T$, and $Y_e$, evaluate the NSE state via table interpolation and print it out. -* ``test_ase`` : +* ``nse_net_cell`` : for the self-consistent NSE, take a $\rho$, $T$, and $Y_e$, and solve for the NSE state. Then check the NSE condition to see if we are actually satisfying the NSE criteria for the network. -* ``test_part_func`` +* ``part_func_cell`` exercise the partition function interpolation for a few select nuclei. From 650f9f3bd9cbd36a1fd883fa750c4f1cea789459 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 28 Jan 2025 10:36:55 -0500 Subject: [PATCH 3/3] fix readme --- unit_test/nse_net_cell/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unit_test/nse_net_cell/README.md b/unit_test/nse_net_cell/README.md index 098db51823..62f7308040 100644 --- a/unit_test/nse_net_cell/README.md +++ b/unit_test/nse_net_cell/README.md @@ -1,6 +1,6 @@ -# test_nse_net +# `nse_net_cell` -`test_nse_net` finds the NSE mass fractions of a given state. +`nse_net_cell` finds the NSE mass fractions of a given state. The density, temperature, and composition are set in the inputs file. Then we update the NSE mass fraction to the current state to make sure we're in NSE. Then we @@ -9,4 +9,4 @@ we're in NSE or not. Upon completion, the new state is printed to the screen. And a statement is printed to see whether we're in NSE -or not. \ No newline at end of file +or not.