diff --git a/libs/cartesiandomain/cartesianmotion_withreset.hpp b/libs/cartesiandomain/cartesianmotion_withreset.hpp index 20da70d5c..04baf6f48 100644 --- a/libs/cartesiandomain/cartesianmotion_withreset.hpp +++ b/libs/cartesiandomain/cartesianmotion_withreset.hpp @@ -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 diff --git a/scripts/create_gbxboundariesbinary_script.py b/scripts/create_gbxboundariesbinary_script.py index 53578f188..77ac30448 100644 --- a/scripts/create_gbxboundariesbinary_script.py +++ b/scripts/create_gbxboundariesbinary_script.py @@ -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 @@ -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 diff --git a/scripts/create_initsuperdropsbinary_script.py b/scripts/create_initsuperdropsbinary_script.py index c0034996b..2477947c0 100644 --- a/scripts/create_initsuperdropsbinary_script.py +++ b/scripts/create_initsuperdropsbinary_script.py @@ -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 --- ### diff --git a/src/config/config.txt b/src/config/config.txt index 07a631c57..199bfb973 100644 --- a/src/config/config.txt +++ b/src/config/config.txt @@ -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 @@ -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 # diff --git a/src/main.cpp b/src/main.cpp index 021ef5d96..007c9ddf5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 @@ -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,