From 14245218c25faa40aea87e4e423cf03e7623d9cd Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Tue, 25 Jul 2023 11:52:24 -0400 Subject: [PATCH 1/3] fix a few more parmparse line continuations (#2536) --- .../Rad2Tshock/inputs.M5.mg.test | 28 +++++++++---------- .../Rad2Tshock/inputs.M5.mg.test.multid | 28 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test b/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test index 5f4c0c9ee9..5041ee225a 100644 --- a/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test +++ b/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test @@ -165,22 +165,22 @@ radiation.hi_bcflag = 0 0 0 # radiation.lo_bcval = 0 0 0 # radiation.hi_bcval = 0 0 0 -radiation.lo_bcval0 = 3.27517624962438426E-014 2.82440556862939748E-013 -2.42497757527818012E-012 2.06318928406580997E-011 -1.72250911764424658E-010 1.38202167847469962E-009 -1.01793273622194353E-008 6.19571982820059287E-008 -2.42768244637479146E-007 3.56904140550843428E-007 -8.25303873091818086E-008 6.56183715461762625E-010 -4.87717642913733243E-015 0.0000000000000000 0.0000000000000000 +radiation.lo_bcval0 = 3.27517624962438426E-014 2.82440556862939748E-013 \ +2.42497757527818012E-012 2.06318928406580997E-011 \ +1.72250911764424658E-010 1.38202167847469962E-009 \ +1.01793273622194353E-008 6.19571982820059287E-008 \ +2.42768244637479146E-007 3.56904140550843428E-007 \ +8.25303873091818086E-008 6.56183715461762625E-010 \ +4.87717642913733243E-015 0.0000000000000000 0.0000000000000000 \ 0.0000000000000000 -radiation.hi_bcval0 = 2.81241745447867642E-013 2.43427083781028680E-012 -2.10589023672203340E-011 1.81989273590520617E-010 -1.56933800834926731E-009 1.34726324109544666E-008 -1.14601755897558854E-007 9.56358213326894788E-007 -7.66592208464726935E-006 5.63476073748010151E-005 -3.41365489499386712E-004 1.32317116979096768E-003 -1.90152165072088103E-003 4.22478249639437597E-004 +radiation.hi_bcval0 = 2.81241745447867642E-013 2.43427083781028680E-012 \ +2.10589023672203340E-011 1.81989273590520617E-010 \ +1.56933800834926731E-009 1.34726324109544666E-008 \ +1.14601755897558854E-007 9.56358213326894788E-007 \ +7.66592208464726935E-006 5.63476073748010151E-005 \ +3.41365489499386712E-004 1.32317116979096768E-003 \ +1.90152165072088103E-003 4.22478249639437597E-004 \ 3.10661088952744746E-006 1.95926322041350964E-011 # ------------------ INPUTS TO RADIATION SOLVER CLASS ------------------- diff --git a/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test.multid b/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test.multid index 615e347b61..7e7067894d 100644 --- a/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test.multid +++ b/Exec/radiation_tests/Rad2Tshock/inputs.M5.mg.test.multid @@ -165,22 +165,22 @@ radiation.hi_bcflag = 0 0 0 # radiation.lo_bcval = 0 0 0 # radiation.hi_bcval = 0 0 0 -radiation.lo_bcval0 = 3.27517624962438426E-014 2.82440556862939748E-013 -2.42497757527818012E-012 2.06318928406580997E-011 -1.72250911764424658E-010 1.38202167847469962E-009 -1.01793273622194353E-008 6.19571982820059287E-008 -2.42768244637479146E-007 3.56904140550843428E-007 -8.25303873091818086E-008 6.56183715461762625E-010 -4.87717642913733243E-015 0.0000000000000000 0.0000000000000000 +radiation.lo_bcval0 = 3.27517624962438426E-014 2.82440556862939748E-013 \ +2.42497757527818012E-012 2.06318928406580997E-011 \ +1.72250911764424658E-010 1.38202167847469962E-009 \ +1.01793273622194353E-008 6.19571982820059287E-008 \ +2.42768244637479146E-007 3.56904140550843428E-007 \ +8.25303873091818086E-008 6.56183715461762625E-010 \ +4.87717642913733243E-015 0.0000000000000000 0.0000000000000000 \ 0.0000000000000000 -radiation.hi_bcval0 = 2.81241745447867642E-013 2.43427083781028680E-012 -2.10589023672203340E-011 1.81989273590520617E-010 -1.56933800834926731E-009 1.34726324109544666E-008 -1.14601755897558854E-007 9.56358213326894788E-007 -7.66592208464726935E-006 5.63476073748010151E-005 -3.41365489499386712E-004 1.32317116979096768E-003 -1.90152165072088103E-003 4.22478249639437597E-004 +radiation.hi_bcval0 = 2.81241745447867642E-013 2.43427083781028680E-012 \ +2.10589023672203340E-011 1.81989273590520617E-010 \ +1.56933800834926731E-009 1.34726324109544666E-008 \ +1.14601755897558854E-007 9.56358213326894788E-007 \ +7.66592208464726935E-006 5.63476073748010151E-005 \ +3.41365489499386712E-004 1.32317116979096768E-003 \ +1.90152165072088103E-003 4.22478249639437597E-004 \ 3.10661088952744746E-006 1.95926322041350964E-011 # ------------------ INPUTS TO RADIATION SOLVER CLASS ------------------- From 4174f17ebc7d56c6bfeb6d4978845c19e8666d2a Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 25 Jul 2023 14:28:21 -0400 Subject: [PATCH 2/3] Update CI that depends on triple_alpha_plus_cago (#2535) --- .../react_converge_128_true_sdc.out | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/Exec/reacting_tests/reacting_convergence/ci-benchmarks/react_converge_128_true_sdc.out b/Exec/reacting_tests/reacting_convergence/ci-benchmarks/react_converge_128_true_sdc.out index cc646201ff..b867f0c375 100644 --- a/Exec/reacting_tests/reacting_convergence/ci-benchmarks/react_converge_128_true_sdc.out +++ b/Exec/reacting_tests/reacting_convergence/ci-benchmarks/react_converge_128_true_sdc.out @@ -2,58 +2,58 @@ time = 0.000901 variables minimum value maximum value density 499999.99996 1003267.4037 - xmom -1.6405409399e+12 1.6405409399e+12 - ymom -1.6405409399e+12 1.6405409399e+12 + xmom -1.64054094e+12 1.64054094e+12 + ymom -1.64054094e+12 1.64054094e+12 zmom 0 0 - rho_E 2.263117857e+22 7.0166374924e+22 - rho_e 2.263117857e+22 7.0166358971e+22 - Temp 300032898.05 454530914.94 - rho_He4 499997.75752 1002591.9747 - rho_C12 2.2423384461 675.42840306 - rho_O16 5.0003881018e-05 0.00047398074259 + rho_E 2.263117857e+22 7.0166374851e+22 + rho_e 2.263117857e+22 7.0166358897e+22 + Temp 300032898.05 454530914.06 + rho_He4 499997.75752 1002591.9748 + rho_C12 2.2423384483 675.42858349 + rho_O16 5.0001038346e-05 0.00023067858795 rho_Fe56 4.9999999996e-05 0.00010032674037 - rho_enuc 1.4565744228e+21 4.5249976081e+23 - density_sdc_source -544925.79439 78513.247881 - xmom_sdc_source -1.8266340473e+15 1.8266340473e+15 - ymom_sdc_source -1.8266340473e+15 1.8266340473e+15 + rho_enuc 1.4565745423e+21 4.5249954871e+23 + density_sdc_source -544925.79275 78513.247889 + xmom_sdc_source -1.8266340469e+15 1.8266340469e+15 + ymom_sdc_source -1.8266340469e+15 1.8266340469e+15 zmom_sdc_source 0 0 - rho_E_sdc_source -6.1992465072e+22 7.5781242372e+21 - rho_e_sdc_source -6.1984074245e+22 6.3082607661e+21 + rho_E_sdc_source -6.1992456785e+22 7.5781242406e+21 + rho_e_sdc_source -6.1984065959e+22 6.3082607681e+21 Temp_sdc_source 0 0 - rho_He4_sdc_source -543231.29031 78510.973912 - rho_C12_sdc_source -1694.4762124 10.073671104 - rho_O16_sdc_source -0.027819745447 5.9867619328e-06 - rho_Fe56_sdc_source -5.4492579439e-05 7.8513247881e-06 - pressure 1.4155320805e+22 4.26081309e+22 - kineng 1.0456708952e-13 1.6647276223e+18 - soundspeed 212069503.63 257404342.33 - Gamma_1 1.5601126451 1.5885713572 - MachNumber 3.0496449897e-18 0.0086982771588 - entropy 348439780.9 349209883.71 - magvort 2.2088105346e-29 0.00018541051833 - divu -0.11633879119 0.55816306183 - eint_E 4.5262357143e+16 6.9937847751e+16 - eint_e 4.5262357143e+16 6.9937843801e+16 + rho_He4_sdc_source -543231.29383 78510.973919 + rho_C12_sdc_source -1694.4890575 10.073635142 + rho_O16_sdc_source -0.0098093776861 7.1506350196e-06 + rho_Fe56_sdc_source -5.4492579275e-05 7.8513247889e-06 + pressure 1.4155320805e+22 4.2608130858e+22 + kineng 6.7398897838e-15 1.6647276226e+18 + soundspeed 212069503.63 257404342.21 + Gamma_1 1.5601126452 1.5885713572 + MachNumber 7.7424457878e-19 0.0086982771596 + entropy 348439780.9 349209883.57 + magvort 0 0.00018541051835 + divu -0.1163387912 0.55816306007 + eint_E 4.5262357143e+16 6.9937847678e+16 + eint_e 4.5262357143e+16 6.9937843728e+16 logden 5.6989700043 6.0014167022 StateErr_0 499999.99996 1003267.4037 - StateErr_1 300032898.05 454530914.94 - StateErr_2 0.99932677073 0.99999551512 - X(He4) 0.99932677073 0.99999551512 - X(C12) 4.4846768926e-06 0.00067322869314 - X(O16) 1.0000776204e-10 4.7243709987e-10 + StateErr_1 300032898.05 454530914.06 + StateErr_2 0.9993267708 0.99999551512 + X(He4) 0.9993267708 0.99999551512 + X(C12) 4.484676897e-06 0.00067322887298 + X(O16) 1.000020767e-10 2.2992732257e-10 X(Fe56) 1e-10 1e-10 - abar 4.0000119598 4.0017960844 + abar 4.0000119598 4.0017960842 Ye 0.5 0.5 - x_velocity -2064636.8119 2064636.8119 - y_velocity -2064636.8119 2064636.8119 + x_velocity -2064636.8122 2064636.8122 + y_velocity -2064636.8122 2064636.8122 z_velocity 0 0 - t_sound_t_enuc 0.00023710314718 0.019573278445 - enuc 2.9131488458e+15 4.5102607654e+17 - magvel 6.4673669922e-10 2067446.1361 - radvel -0.00067837157832 2067446.136 - circvel 0 11.820185992 - magmom 0.00032336834958 1.6422547233e+12 - angular_momentum_x -0 -0 - angular_momentum_y -0 -0 - angular_momentum_z -1.2410862709e+14 1.241086269e+14 + t_sound_t_enuc 0.00023710316663 0.0195732693 + enuc 2.9131490847e+15 4.5102586513e+17 + magvel 1.6419366351e-10 2067446.1363 + radvel -0.00067838574982 2067446.1363 + circvel 0 11.820144682 + magmom 8.209683175e-05 1.6422547233e+12 + angular_momentum_x 0 0 + angular_momentum_y 0 0 + angular_momentum_z -1.2410862732e+14 1.2410862751e+14 From 60a058987642dde487acd8e365923654b8918c87 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Tue, 1 Aug 2023 18:54:59 -0400 Subject: [PATCH 3/3] Update AMReX and Microphysics to release 23.08 --- external/Microphysics | 2 +- external/amrex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Microphysics b/external/Microphysics index 37551260a0..588beb9c1c 160000 --- a/external/Microphysics +++ b/external/Microphysics @@ -1 +1 @@ -Subproject commit 37551260a0c17a85dd6d08fc289a64c38dfa46a6 +Subproject commit 588beb9c1cb042861b54dce7e321ff10319e4921 diff --git a/external/amrex b/external/amrex index 587542a395..b905668d2f 160000 --- a/external/amrex +++ b/external/amrex @@ -1 +1 @@ -Subproject commit 587542a395e4bd1991c3e731b289ca89fe43746e +Subproject commit b905668d2fef9cd595352aa26bafe794aae0088b