Skip to content

Commit

Permalink
testing with 1gbx
Browse files Browse the repository at this point in the history
  • Loading branch information
yoctoyotta1024 committed Dec 28, 2023
1 parent 016e6d1 commit 300ce76
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion libs/cartesiandomain/cartesianmotion_withreset.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ struct ResetSuperdrop
{
const auto sdgbxindex = urbg(gbxidxs.first,
gbxidxs.second); // randomly selected gbxindex in range {incl., excl.}

const auto bounds = gbxmaps.coord3bounds(sdgbxindex);
const auto coord3 = urbg.drand(bounds.first, bounds.second); // random coord within gbx bounds

Expand Down
6 changes: 3 additions & 3 deletions scripts/create_gbxboundariesbinary_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Author: Clara Bayley (CB)
Additional Contributors:
-----
Last Modified: Thursday 21st December 2023
Last Modified: Thursday 28th December 2023
Modified By: CB
-----
License: BSD 3-Clause "New" or "Revised" License
Expand Down Expand Up @@ -44,9 +44,9 @@
gridfile = binariespath+"/dimlessGBxboundaries.dat" # note this should match config.txt

### input parameters for zcoords of gridbox boundaries
zmax = 1500 # maximum z coord [m]
zmax = 100 # maximum z coord [m]
zmin = 0 # minimum z coord [m]
zdelta = 300 # even spacing
zdelta = 100 # even spacing
zgrid = [zmin, zmax, zdelta]

### input parameters for x coords of gridbox boundaries
Expand Down
2 changes: 1 addition & 1 deletion scripts/create_initsuperdropsbinary_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
# zlim = 1000
# npergbx = 8
# nsupers = crdgens.nsupers_at_domain_base(gridfile, constsfile, npergbx, zlim)
nsupers = 40
nsupers = 200
### ------------------------------------------- ###

### --- Choice of Superdroplet Radii Generator --- ###
Expand Down
4 changes: 2 additions & 2 deletions src/config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Author: Clara Bayley (CB)
* Additional Contributors:
* -----
* Last Modified: Thursday 21st December 2023
* Last Modified: Thursday 28th December 2023
* Modified By: CB
* -----
* License: BSD 3-Clause "New" or "Revised" License
Expand Down Expand Up @@ -39,7 +39,7 @@ maxchunk = 1250000 # maximum no. of elements in chunks of
### SDM Runtime parameters ###
# domain setup #
nspacedims = 1 # no. of spatial dimensions to model
ngbxs = 5 # total number of Gbxs
ngbxs = 1 # total number of Gbxs
totnsupers = 200 # (initial) total no. of SDs

# timestepping #
Expand Down
6 changes: 3 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Author: Clara Bayley (CB)
* Additional Contributors:
* -----
* Last Modified: Thursday 21st December 2023
* Last Modified: Thursday 28th December 2023
* Modified By: CB
* -----
* License: BSD 3-Clause "New" or "Revised" License
Expand Down Expand Up @@ -172,8 +172,8 @@ create_motion(const unsigned int motionstep)
// const auto terminalv = RogersYauTerminalVelocity{};
const auto terminalv = SimmelTerminalVelocity{};

const auto ngbxs = (unsigned int)5; // total number of gbxs
const auto ngbxs4reset = (unsigned int)2; // number of gbxs to randomly select in reset
const auto ngbxs = (unsigned int)1; // total number of gbxs
const auto ngbxs4reset = (unsigned int)1; // number of gbxs to randomly select in reset
return CartesianMotionWithReset(motionstep,
&step2dimlesstime,
terminalv,
Expand Down

0 comments on commit 300ce76

Please sign in to comment.