Skip to content

Commit

Permalink
Remove DENS parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin D. Weinberg committed Oct 1, 2023
1 parent 8fa362c commit 927d73d
Show file tree
Hide file tree
Showing 15 changed files with 7 additions and 78 deletions.
7 changes: 0 additions & 7 deletions utils/Analysis/KDcyltest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ main(int argc, char **argv)

int mmax, numx, numy, norder, cmapr, cmapz, nodd=-1;
double rcylmin, rcylmax, vscale;
bool DENS;

if (not ignore) {

Expand Down Expand Up @@ -210,7 +209,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
NMAX = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand Down Expand Up @@ -242,10 +240,6 @@ main(int argc, char **argv)
in.read((char *)&rcylmax, sizeof(double));
in.read((char *)&rscale, sizeof(double));
in.read((char *)&vscale, sizeof(double));

std::cout << "idens=" << idens << std::endl;

if (idens) DENS = true;
}
}
}
Expand All @@ -257,7 +251,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = true;
EmpCylSL::DENS = DENS;

// Create expansion
//
Expand Down
5 changes: 0 additions & 5 deletions utils/Analysis/KL_cyl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ main(int argc, char **argv)

int mmax, numx, numy, norder, cmapr, cmapz, nodd=-1;
double rcylmin, rcylmax, vscale;
bool DENS;

if (not ignore) {

Expand Down Expand Up @@ -285,7 +284,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
NMAX = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand Down Expand Up @@ -317,8 +315,6 @@ main(int argc, char **argv)
in.read((char *)&rcylmax, sizeof(double));
in.read((char *)&rscale, sizeof(double));
in.read((char *)&vscale, sizeof(double));

if (idens) DENS = true;
}
}
}
Expand All @@ -330,7 +326,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = LOG;
EmpCylSL::DENS = DENS;
EmpCylSL::PCAVAR = true;
EmpCylSL::PCADRY = true;

Expand Down
5 changes: 0 additions & 5 deletions utils/Analysis/cross_validation_cyl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ main(int argc, char **argv)

int mmax, numx, numy, norder, cmapr, cmapz, nodd=-1;
double rcylmin, rcylmax, vscale;
bool DENS;

if (not ignore) {

Expand Down Expand Up @@ -285,7 +284,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
NMAX = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["odd"])
nodd = node["odd" ].as<int>();
if (node["cmap"])
Expand Down Expand Up @@ -317,8 +315,6 @@ main(int argc, char **argv)
in.read((char *)&rcylmax, sizeof(double));
in.read((char *)&rscale, sizeof(double));
in.read((char *)&vscale, sizeof(double));

if (idens) DENS = true;
}
}
}
Expand All @@ -330,7 +326,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = LOG;
EmpCylSL::DENS = DENS;
EmpCylSL::PCAVAR = true;

// Create expansion
Expand Down
5 changes: 0 additions & 5 deletions utils/Analysis/cross_validation_cyl2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ main(int argc, char **argv)

int mmax, numx, numy, norder, cmapr, cmapz, nodd=-1;
double rcylmin, rcylmax, vscale;
bool DENS;

if (not ignore) {

Expand Down Expand Up @@ -343,7 +342,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
NMAX = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand Down Expand Up @@ -375,8 +373,6 @@ main(int argc, char **argv)
in.read((char *)&rcylmax, sizeof(double));
in.read((char *)&rscale, sizeof(double));
in.read((char *)&vscale, sizeof(double));

if (idens) DENS = true;
}
}
}
Expand All @@ -388,7 +384,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = LOG;
EmpCylSL::DENS = DENS;
EmpCylSL::PCAVAR = true;
EmpCylSL::PCADRY = true;

Expand Down
6 changes: 0 additions & 6 deletions utils/Analysis/diskeof.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ main(int argc, char **argv)
sleep(20);
#endif

bool DENS = false;

// ==================================================
// Read basis cache
// ==================================================
Expand Down Expand Up @@ -308,7 +306,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
nmax = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand Down Expand Up @@ -340,8 +337,6 @@ main(int argc, char **argv)
in.read((char *)&rcylmax, sizeof(double));
in.read((char *)&rscale, sizeof(double));
in.read((char *)&vscale, sizeof(double));

if (tmp) DENS = true;
}
}

Expand All @@ -352,7 +347,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = true;
EmpCylSL::DENS = DENS;

// Create expansion instance
//
Expand Down
6 changes: 2 additions & 4 deletions utils/Analysis/diskfreqs.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ main(int argc, char **argv)
{
int numx, numy, lmax=36, mmax, nmax, norder, cmapr, cmapz, numr, nodd=-1;
double rcylmin, rcylmax, rscale, vscale, RMAX, Tmin, Tmax, dT, H, eps;
bool DENS, verbose = false, mask = false, ignore, logl;
bool verbose = false, mask = false, ignore, logl;
std::string CACHEFILE, COEFFILE, COEFFILE2, MODEL, OUTFILE, fileType, filePrefix;

// ==================================================
Expand Down Expand Up @@ -200,7 +200,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
nmax = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand All @@ -226,7 +225,7 @@ main(int argc, char **argv)
in.read((char *)&numy, sizeof(int));
in.read((char *)&nmax, sizeof(int));
in.read((char *)&norder, sizeof(int));
in.read((char *)&DENS, sizeof(int));
in.read((char *)&tmp, sizeof(int));
in.read((char *)&cmapr, sizeof(int));
in.read((char *)&rcylmin, sizeof(double));
in.read((char *)&rcylmax, sizeof(double));
Expand All @@ -242,7 +241,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = logl;
EmpCylSL::DENS = DENS;

// Create expansion
//
Expand Down
10 changes: 1 addition & 9 deletions utils/Analysis/diskprof.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ main(int argc, char **argv)
int nice, numx, numy, lmax, mmax, nmax, norder, m1, m2, n1, n2, nodd=-1;
int initc, partc, init, cmapr, cmapz;
double rcylmin, rcylmax, rscale, vscale, snr, Hexp=4.0;
bool DENS, PCA, PVD, verbose = false, mask = false, ignore, logl;
bool PCA, PVD, verbose = false, mask = false, ignore, logl;
std::string CACHEFILE, COEFFILE, cname, dir("."), fileType, filePrefix, config;
std::string psfiles, delim;

Expand Down Expand Up @@ -916,8 +916,6 @@ main(int argc, char **argv)
("C,center", "Accumulation center",
cxxopts::value<std::vector<double> >(c0))
("diff", "render the difference between the trimmed and untrimmed basis")
("density", "compute density",
cxxopts::value<bool>(DENS)->default_value("true"))
("compname", "train on Component (default=stars)",
cxxopts::value<std::string>(cname)->default_value("stars"))
("init", "fiducial index",
Expand Down Expand Up @@ -1125,7 +1123,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
nmax = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand All @@ -1151,11 +1148,7 @@ main(int argc, char **argv)
in.read((char *)&numy, sizeof(int));
in.read((char *)&nmax, sizeof(int));
in.read((char *)&norder, sizeof(int));

in.read((char *)&tmp, sizeof(int));
if (tmp) DENS = true;
else DENS = false;

in.read((char *)&cmapr, sizeof(int));
in.read((char *)&rcylmin, sizeof(double));
in.read((char *)&rcylmax, sizeof(double));
Expand All @@ -1172,7 +1165,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = logl;
EmpCylSL::DENS = DENS;

// Create expansion
//
Expand Down
1 change: 0 additions & 1 deletion utils/Analysis/diskprof_coef.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = true;
EmpCylSL::DENS = dens;

// Create expansion
//
Expand Down
7 changes: 2 additions & 5 deletions utils/Analysis/mssaprof_disk.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ main(int argc, char **argv)

int lmax=36, stride=1;
double rcylmin, rcylmax, rscale, vscale;
bool DENS, verbose = false, mask = false;
bool verbose = false, mask = false;
std::string CACHEFILE, coeffile, config;

cxxopts::Options options(argv[0], overview);
Expand Down Expand Up @@ -509,7 +509,6 @@ main(int argc, char **argv)
// ==================================================

int mmax, numx, numy, nmax, norder, cmapr=1, cmapz=1, tmp, nodd=-1;
bool dens=false;
double rmin, rmax, ascl, hscl;

// Open EOF cachefile
Expand Down Expand Up @@ -563,7 +562,6 @@ main(int argc, char **argv)
numy = node["numy" ].as<int>();
nmax = node["nmax" ].as<int>();
norder = node["norder"].as<int>();
dens = node["dens" ].as<bool>();
if (node["nodd"])
nodd = node["nodd" ].as<int>();
if (node["cmap"])
Expand All @@ -587,7 +585,7 @@ main(int argc, char **argv)
in.read((char *)&numy, sizeof(int));
in.read((char *)&nmax, sizeof(int));
in.read((char *)&norder, sizeof(int));
in.read((char *)&dens, sizeof(int)); if (tmp) dens = true;
in.read((char *)&tmp, sizeof(int));
in.read((char *)&cmapr, sizeof(int));
in.read((char *)&rmin, sizeof(double));
in.read((char *)&rmax, sizeof(double));
Expand All @@ -602,7 +600,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = cmapr;
EmpCylSL::CMAPZ = cmapz;
EmpCylSL::logarithmic = true;
EmpCylSL::DENS = dens;

// Create expansion
//
Expand Down
5 changes: 1 addition & 4 deletions utils/Analysis/pcatest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ main(int argc, char **argv)
int OUTR, OUTZ, lmax, mmax, nmax, norder, numx, numy, nodd;
std::string CACHEFILE, OUTTAG;
double rcylmin, rcylmax, rscale, vscale;
bool DENS, LOGSC;
bool LOGSC;

//
// Parse Command line
Expand Down Expand Up @@ -114,8 +114,6 @@ main(int argc, char **argv)
cxxopts::value<std::string>(CACHEFILE)->default_value(".eof.cache.file"))
("outtag", "outtag for basis files",
cxxopts::value<std::string>(OUTTAG)->default_value("basis"))
("density", "compute density",
cxxopts::value<bool>(DENS)->default_value("true"))
("logscale", "logscale for output basis",
cxxopts::value<bool>(LOGSC)->default_value("false"))
;
Expand Down Expand Up @@ -154,7 +152,6 @@ main(int argc, char **argv)
EmpCylSL::CMAPR = 1;
EmpCylSL::CMAPZ = 1;
EmpCylSL::logarithmic = true;
EmpCylSL::DENS = DENS;
EmpCylSL::NOUT = norder;

// Create expansion
Expand Down
9 changes: 0 additions & 9 deletions utils/ICs/check_coefs.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ main(int ac, char **av)
double ppower;
bool SVD;
int NINT;
bool DENS;
bool ignore;
bool orthotst;
string cachefile;
Expand Down Expand Up @@ -397,8 +396,6 @@ main(int ac, char **av)
cxxopts::value<int>(VFLAG)->default_value("0"))
("expcond", "EOF conditioning from analytic density profile",
cxxopts::value<bool>(expcond)->default_value("true"))
("DENS", "Compute density basis functions",
cxxopts::value<bool>(DENS)->default_value("true"))
("ignore", "Ignore parameters in cachefile and recompute basis",
cxxopts::value<bool>(ignore)->default_value("false"))
("orthotst", "Compute orthgonality of basis functions",
Expand Down Expand Up @@ -604,7 +601,6 @@ main(int ac, char **av)
NUMY = node["numy" ].as<int>();
NMAX = node["nmax" ].as<int>();
NORDER = node["norder"].as<int>();
DENS = node["dens" ].as<bool>();
// RMIN = node["rmin" ].as<double>();
// RMAX = node["rmax" ].as<double>();
ASCALE = node["ascl" ].as<double>();
Expand Down Expand Up @@ -632,11 +628,7 @@ main(int ac, char **av)
in.read((char *)&NUMY, sizeof(int));
in.read((char *)&NMAX, sizeof(int));
in.read((char *)&NORDER, sizeof(int));

in.read((char *)&tmp, sizeof(int));
if (tmp) DENS = true;
else DENS = false;

in.read((char *)&CMTYPE, sizeof(int));
in.read((char *)&RCYLMIN, sizeof(double));
in.read((char *)&RCYLMAX, sizeof(double));
Expand All @@ -663,7 +655,6 @@ main(int ac, char **av)
EmpCylSL::CMAPZ = CMAPZ;
EmpCylSL::VFLAG = VFLAG;
EmpCylSL::logarithmic = LOGR;
EmpCylSL::DENS = DENS;

// For DiskDens
AA = ASCALE;
Expand Down
Loading

0 comments on commit 927d73d

Please sign in to comment.