Skip to content

Commit

Permalink
Merge branch 'development' into clean_up_avisc
Browse files Browse the repository at this point in the history
  • Loading branch information
zingale authored Jul 28, 2024
2 parents 660f4e9 + bb30ff4 commit 9bbde6d
Show file tree
Hide file tree
Showing 16 changed files with 154 additions and 124 deletions.
3 changes: 3 additions & 0 deletions Exec/Make.Castro
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ endif
# Require C++17
CXXSTD := c++17

# Use Lazy QueueReduction for the timing outputs
LAZY := TRUE

# default integrator
INTEGRATOR_DIR ?= VODE

Expand Down
130 changes: 65 additions & 65 deletions Exec/science/Detonation/ci-benchmarks/sdc_det_plt00040_extrema.out
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
plotfile = det_x_plt00040
time = 5.1558159140336702e-06
variables minimum value maximum value
density 185259874.21 216582994.41
xmom -87234240329 2.9512596512e+16
density 185257544.55 216468146.43
xmom -37913405153 2.9568274388e+16
ymom 0 0
zmom 0 0
rho_E 1.3062473821e+26 2.7893784326e+26
rho_e 1.3062473821e+26 2.7751188263e+26
Temp 50000000.026 7845854662.6
rho_H1 2.1207307865e-22 0.020000135717
rho_He3 0.0017225013714 0.02102428438
rho_He4 94358881.486 200001799.59
rho_C12 0.020000000216 21276964.112
rho_N14 1.9999983474e-22 197.76685905
rho_O16 0.02 19209.489937
rho_Ne20 0.02 4937.0489429
rho_Mg24 0.02 23322.104606
rho_Si28 0.02 2015343.4134
rho_S32 0.02 1656264.8265
rho_Ar36 0.02 821829.69632
rho_Ca40 0.02 725030.13946
rho_Ti44 0.02 34172.699418
rho_Cr48 0.02 78131.560865
rho_Fe52 0.02 277298.50875
rho_Fe54 0.02 94994585.838
rho_Ni56 0.02 2238978.4894
rho_n 2.1207307865e-22 234580.14761
rho_p 0.019999995438 3609721.5282
rho_enuc -4.6900452682e+29 3.5791669148e+32
pressure 5.5236728651e+25 1.1610544319e+26
kineng 0 2.0455630311e+24
soundspeed 612864631.21 895226067.36
Gamma_1 1.3599756137 1.3820271358
MachNumber 0 0.16114390973
uplusc 612864631.21 999569362.18
uminusc -895226468.14 -612860078.6
entropy 98214767.758 336273451.62
rho_E 1.3062473821e+26 2.7893330499e+26
rho_e 1.3062473821e+26 2.77508064e+26
Temp 50000000.026 7845891849.2
rho_H1 2.1211722106e-22 0.020000096415
rho_He3 0.0017224293869 0.021023770747
rho_He4 94366787.107 200001406.23
rho_C12 0.020000000216 21736627.589
rho_N14 1.9999999481e-22 0.020000141427
rho_O16 0.02 21564.50879
rho_Ne20 0.02 4189.5544151
rho_Mg24 0.02 23323.799421
rho_Si28 0.02 2015729.7513
rho_S32 0.02 1656696.6915
rho_Ar36 0.02 822096.59228
rho_Ca40 0.02 724138.29448
rho_Ti44 0.02 34187.547129
rho_Cr48 0.02 78085.100557
rho_Fe52 0.02 278150.27827
rho_Fe54 0.02 94990080.243
rho_Ni56 0.02 2242328.7066
rho_n 2.1211722106e-22 234640.58163
rho_p 0.019999995438 3609403.7361
rho_enuc -4.7086157677e+29 3.5777644631e+32
pressure 5.5236728651e+25 1.1610599873e+26
kineng 0 2.0519264828e+24
soundspeed 612864631.21 895228345.47
Gamma_1 1.3599756425 1.3822442674
MachNumber 0 0.16119509216
uplusc 612864631.21 999919125.29
uminusc -895228523.09 -612861073.53
entropy 98214767.758 336273484.2
magvort 0 0
divu -97746.019905 33801.828895
eint_E 6.5312369103e+17 1.3804343879e+18
eint_e 6.5312369103e+17 1.3804343879e+18
logden 8.2677813648 8.3356243538
StateErr_0 185259874.21 216582994.41
StateErr_1 50000000.026 7845854662.6
divu -97996.218171 33763.099005
eint_E 6.5312369103e+17 1.3804410664e+18
eint_e 6.5312369103e+17 1.3804410664e+18
logden 8.2677759035 8.3353939984
StateErr_0 185257544.55 216468146.43
StateErr_1 50000000.026 7845891849.2
StateErr_2 1e-30 9.9999779324e-11
X(H1) 1e-30 9.9999779324e-11
X(He3) 8.9857380636e-12 9.9999601254e-11
X(He4) 0.48403393423 0.9999999982
X(C12) 1.0000000108e-10 0.10032845398
X(N14) 1e-30 9.3254108586e-07
X(O16) 1e-10 9.604742181e-05
X(Ne20) 1e-10 2.3279941869e-05
X(Mg24) 1e-10 0.00011116921103
X(Si28) 1e-10 0.01005607083
X(S32) 1e-10 0.0083471961707
X(Ar36) 1e-10 0.0041657025725
X(Ca40) 1e-10 0.0037098568497
X(Ti44) 1e-10 0.00017298041086
X(Cr48) 1e-10 0.00040079244474
X(Fe52) 1e-10 0.0013382570124
X(Fe54) 1e-10 0.46490351089
X(Ni56) 1e-10 0.010337739099
X(n) 1e-30 0.0011729003976
X(p) 9.9999977071e-11 0.017596365447
abar 4.000000001 6.7314014168
Ye 0.49998670317 0.50001557187
x_velocity -436.17123215 138623047.3
X(He3) 8.985892423e-12 9.9999601254e-11
X(He4) 0.48406961191 0.9999999982
X(C12) 1.0000000108e-10 0.10247460098
X(N14) 1e-30 1.0000000384e-10
X(O16) 1e-10 0.00010166316852
X(Ne20) 1e-10 1.9751128146e-05
X(Mg24) 1e-10 0.00011117683475
X(Si28) 1e-10 0.010049207028
X(S32) 1e-10 0.0083399755634
X(Ar36) 1e-10 0.0041613939849
X(Ca40) 1e-10 0.003708082998
X(Ti44) 1e-10 0.00017289116777
X(Cr48) 1e-10 0.00040055008209
X(Fe52) 1e-10 0.0013373223366
X(Fe54) 1e-10 0.46488586209
X(Ni56) 1e-10 0.010358700546
X(n) 1e-30 0.0011732028047
X(p) 9.9999977002e-11 0.017592025438
abar 4.000000001 6.7312151705
Ye 0.49998627651 0.50001570244
x_velocity -189.56702545 138792440.56
y_velocity 0 0
z_velocity 0 0
t_sound_t_enuc 3.4412406685e-13 0.97531384976
enuc -2.4936491578e+21 1.6525613771e+24
magvel 0 138623047.3
radvel -436.17123215 138623047.3
t_sound_t_enuc 3.4412406685e-13 0.97569821534
enuc -2.5034688832e+21 1.6527902706e+24
magvel 0 138792440.56
radvel -189.56702545 138792440.56
circvel 0 2
magmom 0 2.9512596512e+16
magmom 0 2.9568274388e+16
angular_momentum_x 0 0
angular_momentum_y 0 0
angular_momentum_z 0 0
Expand Down
4 changes: 2 additions & 2 deletions Exec/science/wdmerger/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ NUM_MODELS = 2
# define the location of the CASTRO top directory
CASTRO_HOME ?= ../../..

# Turn on hybrid momentum, but note that it only is used in 3D at present.
# Turn on hybrid momentum? but note that it only is used in 3D at present.

ifeq ($(DIM), 3)
USE_HYBRID_MOMENTUM ?= TRUE
USE_HYBRID_MOMENTUM ?= FALSE
endif

# Set the default integrator for the burner.
Expand Down
14 changes: 7 additions & 7 deletions Exec/science/wdmerger/ci-benchmarks/wdmerger_collision_2D.out
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
zmom 0 0
rho_E 7.4982062146e+11 5.0669247218e+24
rho_e 7.1077581849e+11 5.0640768325e+24
Temp 242288.68588 1409652233.5
rho_He4 8.693611703e-17 3.5999032981
Temp 242288.68588 1409652233.4
rho_He4 8.693611703e-17 3.5999032939
rho_C12 3.4774446812e-05 7825956.6934
rho_O16 5.2161670217e-05 11739149.75
rho_Ne20 8.693611703e-17 181951.05664
rho_Mg24 8.693611703e-17 1192.7969626
rho_Si28 8.693611703e-17 6.6913702458
rho_S32 8.693611703e-17 0.00019493291444
rho_Ne20 8.693611703e-17 181951.05614
rho_Mg24 8.693611703e-17 1192.7969442
rho_Si28 8.693611703e-17 6.6913701534
rho_S32 8.693611703e-17 0.00019493290914
rho_Ar36 8.693611703e-17 1.9565534609e-05
rho_Ca40 8.693611703e-17 1.9565534331e-05
rho_Ti44 8.693611703e-17 1.9565534308e-05
Expand All @@ -25,5 +25,5 @@
grav_x -684991644 -51428.243166
grav_y -739606241.84 739606820.44
grav_z 0 0
rho_enuc -1.9506340641e+12 7.6429034765e+23
rho_enuc -3.2975004417e+12 7.6429034637e+23

17 changes: 10 additions & 7 deletions Source/diffusion/Castro_diffusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ Castro::construct_old_diff_source(MultiFab& source, MultiFab& state_in, Real tim

if (verbose > 1)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real run_time = ParallelDescriptor::second() - strt_time;

const int IOProc = ParallelDescriptor::IOProcessorNumber();
amrex::Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real llevel = level;
#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(run_time,IOProc);

amrex::Print() << "Castro::construct_old_diff_source() time = " << run_time << " on level " << level << "\n" << "\n";
amrex::Print() << "Castro::construct_old_diff_source() time = " << run_time
<< " on level " << llevel << "\n" << "\n";
#ifdef BL_LAZY
});
#endif
Expand Down Expand Up @@ -59,15 +60,17 @@ Castro::construct_new_diff_source(MultiFab& source, MultiFab& state_old, MultiFa

if (verbose > 1)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real run_time = ParallelDescriptor::second() - strt_time;
const int IOProc = ParallelDescriptor::IOProcessorNumber();
amrex::Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(run_time,IOProc);

amrex::Print() << "Castro::construct_new_diff_source() time = " << run_time << " on level " << level << "\n" << "\n";
amrex::Print() << "Castro::construct_new_diff_source() time = " << run_time
<< " on level " << llevel << "\n" << "\n";
#ifdef BL_LAZY
});
#endif
Expand Down
6 changes: 4 additions & 2 deletions Source/driver/Castro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3048,14 +3048,16 @@ Castro::reflux (int crse_level, int fine_level, bool in_post_timestep)
if (verbose)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real end = ParallelDescriptor::second() - strt;
amrex::Real end = ParallelDescriptor::second() - strt;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(end,IOProc);
if (ParallelDescriptor::IOProcessor()) {
std::cout << "Castro::reflux() at level " << level << " : time = " << end << std::endl;
std::cout << "Castro::reflux() at level " << llevel
<< " : time = " << end << std::endl;
}
#ifdef BL_LAZY
});
Expand Down
30 changes: 19 additions & 11 deletions Source/gravity/Castro_gravity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,17 @@ Castro::construct_old_gravity (Real time)

if (verbose > 0)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real run_time = ParallelDescriptor::second() - strt_time;
const int IOProc = ParallelDescriptor::IOProcessorNumber();
amrex::Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(run_time,IOProc);

amrex::Print() << "Castro::construct_old_gravity() time = " << run_time << " on level " << level << "\n" << "\n";
amrex::Print() << "Castro::construct_old_gravity() time = " << run_time << " on level "
<< llevel << "\n" << "\n";
#ifdef BL_LAZY
});
#endif
Expand Down Expand Up @@ -278,15 +280,17 @@ Castro::construct_new_gravity (Real time)

if (verbose > 0)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real run_time = ParallelDescriptor::second() - strt_time;
const int IOProc = ParallelDescriptor::IOProcessorNumber();
amrex::Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(run_time,IOProc);

amrex::Print() << "Castro::construct_new_gravity() time = " << run_time << " on level " << level << "\n" << "\n";
amrex::Print() << "Castro::construct_new_gravity() time = " << run_time
<< " on level " << llevel << "\n" << "\n";
#ifdef BL_LAZY
});
#endif
Expand Down Expand Up @@ -431,14 +435,16 @@ void Castro::construct_old_gravity_source(MultiFab& source, MultiFab& state_in,
if (castro::verbose > 1)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(run_time,IOProc);

amrex::Print() << "Castro::construct_old_gravity_source() time = " << run_time << " on level " << level << "\n" << "\n";
amrex::Print() << "Castro::construct_old_gravity_source() time = " << run_time
<< " on level " << llevel << "\n" << "\n";
#ifdef BL_LAZY
});
#endif
Expand Down Expand Up @@ -667,15 +673,17 @@ void Castro::construct_new_gravity_source(MultiFab& source, MultiFab& state_old,

if (castro::verbose > 1)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real run_time = ParallelDescriptor::second() - strt_time;
const int IOProc = ParallelDescriptor::IOProcessorNumber();
amrex::Real run_time = ParallelDescriptor::second() - strt_time;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(run_time,IOProc);

amrex::Print() << "Castro::construct_new_gravity_source() time = " << run_time << " on level " << level << "\n" << "\n";
amrex::Print() << "Castro::construct_new_gravity_source() time = " << run_time
<< " on level " << llevel << "\n" << "\n";
#ifdef BL_LAZY
});
#endif
Expand Down
6 changes: 4 additions & 2 deletions Source/gravity/Gravity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -457,13 +457,15 @@ Gravity::solve_for_phi (int level,
if (gravity::verbose)
{
const int IOProc = ParallelDescriptor::IOProcessorNumber();
Real end = ParallelDescriptor::second() - strt;
amrex::Real end = ParallelDescriptor::second() - strt;
amrex::Real llevel = level;

#ifdef BL_LAZY
Lazy::QueueReduction( [=] () mutable {
#endif
ParallelDescriptor::ReduceRealMax(end,IOProc);
amrex::Print() << "Gravity::solve_for_phi() time = " << end << " on level " << level << std::endl << std::endl;
amrex::Print() << "Gravity::solve_for_phi() time = " << end << " on level "
<< llevel << std::endl << std::endl;
#ifdef BL_LAZY
});
#endif
Expand Down
Loading

0 comments on commit 9bbde6d

Please sign in to comment.