Skip to content

Commit

Permalink
Merge branch 'main' of github.com:AMReX-FHD/FHDeX into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbbel
jbbel committed Jan 27, 2025
2 parents b6638d5 + 172cc77 commit 3a7d8a6
Show file tree
Hide file tree
Showing 119 changed files with 8,068 additions and 2,087 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/dependencies/dependencies_nvcc11.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ sudo apt-get install -y \
cuda-nvml-dev-11-2 \
cuda-nvtx-11-2 \
libcurand-dev-11-2 \
libcufft-dev-11-2
libcufft-dev-11-2 \
libcusparse-dev-11-2
sudo ln -s cuda-11.2 /usr/local/cuda


2 changes: 1 addition & 1 deletion exec/DSMC/DsmcCollide.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void FhdParticleContainer::CalcSelections(Real dt)
crossSection = csx[ij_spec];
//crossSection = 0;
if(i_spec==j_spec) {np_j = np_i-1;}
NSel = particle_neff_tmp*np_i*np_j*crossSection*vrmax*ocollisionCellVolTmp*dt;
NSel = particle_neff_tmp*np_i*np_j*crossSection*vrmax*ocollisionCellVolTmp*dt*2;
if(i_spec==j_spec) {NSel = NSel*0.5;}
arrselect(i,j,k,ij_spec) = std::floor(NSel + amrex::Random(engine));

Expand Down
7 changes: 2 additions & 5 deletions exec/DSMC/inputs_conc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
bc_mass_lo = -1 -1 -1
bc_mass_hi = -1 -1 -1

bc_spec_lo = 1 -1 -1
bc_spec_hi = 0 -1 -1

# Temperature if thermal BC specified
t_hi = 300 300 300
t_lo = 300 300 300
Expand All @@ -86,8 +83,8 @@
# Xk and Yk at the wall for Dirichlet (concentrations) - set one to zero
# Ordering: (species 1, x-dir), (species 2, x-dir), ... (species 1, y-dir), ...

bc_Yk_x_lo = 0.45 0.55 # lo BC
bc_Yk_x_hi = 0.55 0.45 # hi BC
bc_Yk_x_lo = 0.49375 0.50625 # lo BC
bc_Yk_x_hi = 0.50625 0.49375 # hi BC
bc_Yk_y_lo = 1.0 1.0 # lo BC
bc_Yk_y_hi = 1.0 1.0 # hi BC
bc_Yk_z_lo = 1.0 1.0 # lo BC
Expand Down
3 changes: 0 additions & 3 deletions exec/DSMC/inputs_conc_gpu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@
bc_mass_lo = -1 -1 -1
bc_mass_hi = -1 -1 -1

bc_spec_lo = 1 -1 -1
bc_spec_hi = 0 -1 -1

# Temperature if thermal BC specified
#t_hi = 519 300 300
#t_lo = 273 300 300
Expand Down
13 changes: 8 additions & 5 deletions exec/DSMC/main_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ void main_driver(const char* argv)
particles.CalcSelections(dt);
particles.CollideParticles(dt);

if(istep%2!=0)
// if(istep%2!=0)
if(false)
{
particles.EvaluateStats(cuInst,cuMeans,cuVars,primInst,primMeans,primVars,
cvlInst,cvlMeans,QMeans,coVars,spatialCross1D,statsCount++,time);
Expand All @@ -355,17 +356,19 @@ void main_driver(const char* argv)
//PrintMF(structFactPrimMF,0,-1);
//PrintMF(primInst,1,1);

structFactPrim.FortStructure(structFactPrimMF,geom);
//structFactPrim.FortStructure(structFactPrimMF);

}
}
particles.Source(dt, paramPlaneList, paramPlaneCount, cuInst);

//particles.externalForce(dt);
particles.Source(dt, paramPlaneList, paramPlaneCount, cuInst);
particles.MoveParticlesCPP(dt, paramPlaneList, paramPlaneCount);
//particles.updateTimeStep(geom,dt);
//reduceMassFlux(paramPlaneList, paramPlaneCount);

if(istep%2==0)
if(true)
// if(istep%2==0)
{
particles.EvaluateStats(cuInst,cuMeans,cuVars,primInst,primMeans,primVars,
cvlInst,cvlMeans,QMeans,coVars,spatialCross1D,statsCount++,time);
Expand All @@ -386,7 +389,7 @@ void main_driver(const char* argv)
//PrintMF(structFactPrimMF,0,-1);
//PrintMF(primInst,1,1);

structFactPrim.FortStructure(structFactPrimMF,geom);
//structFactPrim.FortStructure(structFactPrimMF);

}
}
Expand Down
2 changes: 1 addition & 1 deletion exec/DSMC_granular/main_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF,primInst,8,cnt_sf,numvars_sf,0);
cnt_sf += numvars_sf;

structFactPrim.FortStructure(structFactPrimMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
}

if(istep > amrex::Math::abs(n_steps_skip) &&
Expand Down
4 changes: 2 additions & 2 deletions exec/Ek_calculator/main_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ void main_driver(const char* argv)


// reset and compute structure factor
turbStructFact.FortStructure(vel,geom,1);
turbStructFact.CallFinalize(geom);
turbStructFact.FortStructure(vel,1);
turbStructFact.CallFinalize();

// integrate cov_mag over shells in k and write to file
turbStructFact.IntegratekShells(0,geom);
Expand Down
4 changes: 2 additions & 2 deletions exec/cellbdytest_new/main_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1809,13 +1809,13 @@ void main_driver(const char* argv)

// charge
MultiFab::Copy(struct_cc_charge, charge, 0, 0, nvar_sf_charge, 0);
structFact_charge.FortStructure(struct_cc_charge,geomP);
structFact_charge.FortStructure(struct_cc_charge);

// velocity
for (int d=0; d<AMREX_SPACEDIM; ++d) {
ShiftFaceToCC(umac[d],0,struct_cc_vel,d,1);
}
structFact_vel.FortStructure(struct_cc_vel,geom);
structFact_vel.FortStructure(struct_cc_vel);

// plot structure factor on plot_int
if (istep%plot_int == 0) {
Expand Down
1 change: 1 addition & 0 deletions exec/compressible/GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ DIM = 3
TINY_PROFILE = FALSE
MAX_SPEC = 8
MAX_REAC = 5
USE_FFT = TRUE

USE_PARTICLES = FALSE

Expand Down
4 changes: 2 additions & 2 deletions exec/compressible/inputs_giantfluct_3d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

# Xk and Yk at the wall for Dirichlet (concentrations) - set one to zero
# Ordering: (species 1, x-dir), (species 2, x-dir), ... (species 1, y-dir), ...
bc_Yk_y_lo = 0.2 0.09316672 0.70683296 # lo BC
bc_Yk_y_hi = 0.3 0.40683328 0.29316704 # hi BC
bc_Yk_y_lo = 0.2 0.09316672 0.70683328 # lo BC
bc_Yk_y_hi = 0.3 0.40683328 0.29316672 # hi BC


10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m00.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -672,11 +672,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m01-cutemp_jsq.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -684,11 +684,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m01.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -672,11 +672,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m02.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -725,11 +725,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m10.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -681,11 +681,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -685,11 +685,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/2020/m12.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -687,11 +687,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/202101_before_mui_span/main_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -700,11 +700,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
10 changes: 5 additions & 5 deletions exec/compressible_mui/sav_src/202101_before_mui_span/main_driver.cpp_0126_bc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -713,11 +713,11 @@ void main_driver(const char* argv)
MultiFab::Copy(structFactPrimMF, prim, 0, 0, structVarsPrim, 0);
MultiFab::Copy(structFactConsMF, cu, 0, 0, structVarsCons-1, 0);
MultiFab::Copy(structFactConsMF, prim, AMREX_SPACEDIM+1, structVarsCons-1, 1, 0); // temperature too
structFactPrim.FortStructure(structFactPrimMF,geom);
structFactCons.FortStructure(structFactConsMF,geom);
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg,geom_flat);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}

Expand Down
Loading

0 comments on commit 3a7d8a6

Please sign in to comment.