From 085f662201e6343778623fdb156e1c42463ffbb4 Mon Sep 17 00:00:00 2001 From: CarrieFilion <15cfilion@gmail.com> Date: Thu, 10 Oct 2024 13:30:09 -0400 Subject: [PATCH 1/2] editing defaults for consistency --- utils/ICs/initial.cc | 8 ++++---- utils/SL/slshift.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/ICs/initial.cc b/utils/ICs/initial.cc index d5d949c55..c4b5ec551 100644 --- a/utils/ICs/initial.cc +++ b/utils/ICs/initial.cc @@ -398,9 +398,9 @@ main(int ac, char **av) ("LMAX", "Harmonic order for halo expansion", cxxopts::value(LMAX)->default_value("18")) ("LMAXFID", "Harmonic order for EOF spherical model", - cxxopts::value(LMAXFID)->default_value("48")) + cxxopts::value(LMAXFID)->default_value("128")) ("NMAXFID", "Radial order for EOF spherical model", - cxxopts::value(NMAXFID)->default_value("48")) + cxxopts::value(NMAXFID)->default_value("64")) ("MMAX", "Aximuthal order for Cylindrical expansion", cxxopts::value(MMAX)->default_value("6")) ("NUMX", "Number of knots in radial dimension of meridional grid", @@ -434,7 +434,7 @@ main(int ac, char **av) ("NOUT", "Number of radial terms in diagnostic basis file for cylinder", cxxopts::value(NOUT)->default_value("18")) ("NODD", "Number of vertically odd terms in cylindrical expansion", - cxxopts::value(NODD)->default_value("6")) + cxxopts::value(NODD)->default_value("9")) ("NMAXH", "Number of radial terms for spherical expansion", cxxopts::value(NMAXH)->default_value("18")) ("NMAXD", "Number of radial terms for cylindrical expansion", @@ -518,7 +518,7 @@ main(int ac, char **av) ("SCSPH", "Scale for Spherical SL coordinate mapping", cxxopts::value(SCSPH)->default_value("1.0")) ("RSPHSL", "Maximum halo expansion radius", - cxxopts::value(RSPHSL)->default_value("47.5")) + cxxopts::value(RSPHSL)->default_value("1.95")) ("ASCALE", "Radial scale length for disk basis construction", cxxopts::value(ASCALE)->default_value("1.0")) ("ASHIFT", "Fraction of scale length for shift in conditioning function", diff --git a/utils/SL/slshift.cc b/utils/SL/slshift.cc index 9356152eb..fabe9d7e4 100644 --- a/utils/SL/slshift.cc +++ b/utils/SL/slshift.cc @@ -353,7 +353,7 @@ main(int argc, char** argv) ("Lmax", "maximum number of angular harmonics in the expansion", cxxopts::value(Lmax)->default_value("2")) ("nmax", "maximum number of radial harmonics in the expansion", - cxxopts::value(nmax)->default_value("10")) + cxxopts::value(nmax)->default_value("18")) ("numr", "radial knots in the shift operator", cxxopts::value(numr)->default_value("1000")) ("rmin", "minimum radius for the shift operator", From 283f9d896e1b7ef8d2661b3d79cde87d8beb7f3c Mon Sep 17 00:00:00 2001 From: CarrieFilion <15cfilion@gmail.com> Date: Sat, 26 Oct 2024 10:42:52 -0400 Subject: [PATCH 2/2] percolating some changes through - --- expui/BiorthBasis.cc | 2 +- src/expand.H | 2 +- utils/ICs/cylcache.cc | 4 ++-- utils/ICs/initial.cc | 2 +- utils/SL/diskpot.cc | 2 +- utils/SL/oftest.cc | 2 +- utils/SL/qtest.cc | 2 +- utils/SL/slabchk.cc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/expui/BiorthBasis.cc b/expui/BiorthBasis.cc index 618e31b34..9f124163c 100644 --- a/expui/BiorthBasis.cc +++ b/expui/BiorthBasis.cc @@ -1031,7 +1031,7 @@ namespace BasisClasses nmax = 18; mmax = 6; mlim = std::numeric_limits::max(); - lmaxfid = 128; + lmaxfid = 72; nmaxfid = 64; ncylnx = 256; ncylny = 128; diff --git a/src/expand.H b/src/expand.H index b8c22d892..220b9187c 100644 --- a/src/expand.H +++ b/src/expand.H @@ -26,7 +26,7 @@ KEYWORD EXPLANATION DEFAULT ---------- ---------------------------- -------- lmax = maximum harmonic order 4 - nmax = maxinum radial order 10 + nmax = maximum radial order 18 nlog = interval between log output 10 nlist = interval between p-s output 50 nsteps = total number of steps to run 500 diff --git a/utils/ICs/cylcache.cc b/utils/ICs/cylcache.cc index 9a2422c6f..fd78cdbf8 100644 --- a/utils/ICs/cylcache.cc +++ b/utils/ICs/cylcache.cc @@ -327,7 +327,7 @@ main(int ac, char **av) ("ctype", "DiskHalo radial coordinate scaling type (one of: Linear, Log, Rat)", cxxopts::value(ctype)->default_value("Log")) ("LMAXFID", "Maximum angular order for spherical basis in adaptive construction of the cylindrical basis", - cxxopts::value(LMAXFID)->default_value("32")) + cxxopts::value(LMAXFID)->default_value("72")) ("NMAXFID", "Maximum radial order for the spherical basis in adapative construction of the cylindrical basis", cxxopts::value(NMAXFID)->default_value("32")) ("MMAX", "Maximum azimuthal order for the cylindrical basis", @@ -341,7 +341,7 @@ main(int ac, char **av) ("NCYLODD", "Number of vertically odd basis functions per harmonic order", cxxopts::value(NCYLODD)->default_value("6")) ("NMAX", "Total number of basis functions per harmonic order", - cxxopts::value(NMAX)->default_value("20")) + cxxopts::value(NMAX)->default_value("18")) ("VFLAG", "Diagnostic flag for EmpCylSL", cxxopts::value(VFLAG)->default_value("31")) ("expcond", "Use analytic target density rather than particle distribution", diff --git a/utils/ICs/initial.cc b/utils/ICs/initial.cc index c4b5ec551..120376e6c 100644 --- a/utils/ICs/initial.cc +++ b/utils/ICs/initial.cc @@ -398,7 +398,7 @@ main(int ac, char **av) ("LMAX", "Harmonic order for halo expansion", cxxopts::value(LMAX)->default_value("18")) ("LMAXFID", "Harmonic order for EOF spherical model", - cxxopts::value(LMAXFID)->default_value("128")) + cxxopts::value(LMAXFID)->default_value("72")) ("NMAXFID", "Radial order for EOF spherical model", cxxopts::value(NMAXFID)->default_value("64")) ("MMAX", "Aximuthal order for Cylindrical expansion", diff --git a/utils/SL/diskpot.cc b/utils/SL/diskpot.cc index d2c930b14..c8cfbb3af 100644 --- a/utils/SL/diskpot.cc +++ b/utils/SL/diskpot.cc @@ -57,7 +57,7 @@ main(int argc, char** argv) int cmap = 0; double scale = 1.0; - int Lmax=16, Nmax=10; + int Lmax=16, Nmax=18; int numr=10000; double rmin=0.0001, rmax=1.0; double delr=0.01, xmax=1.0, zmax=0.1; diff --git a/utils/SL/oftest.cc b/utils/SL/oftest.cc index 1c16b36f5..1426d3ae3 100644 --- a/utils/SL/oftest.cc +++ b/utils/SL/oftest.cc @@ -73,7 +73,7 @@ int main(int argc, char** argv) ("N,mc", "number of particles for Monte Carlo realization", cxxopts::value(N)->default_value("10000")) ("nmax", "maximum number of radial harmonics in the expansion", - cxxopts::value(nmax)->default_value("10")) + cxxopts::value(nmax)->default_value("18")) ("r,rmin", "minimum radius for the SL grid", cxxopts::value(rmin)->default_value("0.0001")) ("R,rmax", "maximum radius for the SL grid", diff --git a/utils/SL/qtest.cc b/utils/SL/qtest.cc index 1a3e1cf40..352777d6e 100644 --- a/utils/SL/qtest.cc +++ b/utils/SL/qtest.cc @@ -35,7 +35,7 @@ int main(int argc, char** argv) ("Lmax", "maximum number of angular harmonics in the expansion", cxxopts::value(Lmax)->default_value("2")) ("nmax", "maximum number of radial harmonics in the expansion", - cxxopts::value(nmax)->default_value("10")) + cxxopts::value(nmax)->default_value("18")) ("numr", "radial knots for the SL grid", cxxopts::value(numr)->default_value("1000")) ("rmin", "minimum radius for the SL grid", diff --git a/utils/SL/slabchk.cc b/utils/SL/slabchk.cc index de3c045ff..c5d36eaa9 100644 --- a/utils/SL/slabchk.cc +++ b/utils/SL/slabchk.cc @@ -29,7 +29,7 @@ main(int argc, char** argv) ("K,kmax", "maximum order of in-plane harmonics", cxxopts::value(kmax)->default_value("4")) ("N,nmax", "maximum number of vertical harmonics", - cxxopts::value(nmax)->default_value("10")) + cxxopts::value(nmax)->default_value("18")) ("n,numz", "size of vertical grid", cxxopts::value(numz)->default_value("1000")) ("Z,zmax", "maximum extent of vertical grid",