From 37ec734b408f3f612a7f5bf993fa852880f473ee Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 17 Aug 2021 16:12:23 +0200 Subject: [PATCH 01/25] first round of fixes --- src/main.cpp | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f968eb1..27f5652 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -58,9 +58,12 @@ using std::ofstream; using namespace MARQOV; - -bool startswith(const std::string longword, const std::string shortword) +/** find out if a string starts with something. + * @param longword + */ +bool startswith(const std::string& longword, const std::string& shortword) noexcept { +// return longword.find(shortword) == 0; if (longword.rfind(shortword, 0) == 0) return true; else return false; } @@ -81,21 +84,15 @@ std::string selectsim_startup(RegistryDB& registry) cout << "Lattice sizes:\t" << nLs << endl; cout << "Replicas:\t" << nreplicass << endl; - if ((nreplicas.size() != nL.size()) && (nreplicas.size() != 1)) throw std::invalid_argument("invalid replica configuration!"); + if ((nreplicas.size() != nL.size()) && (nreplicas.size() != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); return ham; } - - - - -// --------------------------------------- - -void selectsim() +/** Select the respective simulation + */ +void selectsim(RegistryDB& registry, int myrank = 0) { - - RegistryDB registry("../src/config", "ini"); const auto ham = selectsim_startup(registry); std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); @@ -446,7 +443,6 @@ void selectsim() int main(int argc, char* argv[]) { - std::cout<<"MARQOV Copyright (C) 2020-2021, The MARQOV Project contributors"<("mc.ini", "IO", "outdir" ); - std::string logbasedir = registry.Get("mc.ini", "IO", "logdir" ); - - //FIXME: NEVER DELETE USER DATA - std::string command; + int myrank = 0; #ifdef MPIMARQOV - int myrank; MPI_Comm_rank(MPI_COMM_WORLD, &myrank); if (myrank == 0) { #endif - command = "rm -r " + outbasedir; - system(command.c_str()); - command = "rm -r " + logbasedir; - system(command.c_str()); - - makeDir(outbasedir); - makeDir(logbasedir); - + selectsim(registry, myrank); #ifdef MPIMARQOV } -#endif - selectsim(); -#ifdef MPIMARQOV MPI_Finalize(); #endif } -- GitLab From c5ff379b35a459b3191e3e8636062d0ee71c0a88 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 17 Aug 2021 16:16:49 +0200 Subject: [PATCH 02/25] simplify and document startswith --- src/main.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 27f5652..04c73b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,18 +57,16 @@ using std::ofstream; using namespace MARQOV; - -/** find out if a string starts with something. - * @param longword +/** Find out if a string starts with something. + * @param longword we search in this string + * @param shortword we look for this + * @return truen if longword strarts with shortword, else false */ bool startswith(const std::string& longword, const std::string& shortword) noexcept { -// return longword.find(shortword) == 0; - if (longword.rfind(shortword, 0) == 0) return true; - else return false; + return longword.find(shortword) == 0; } - std::string selectsim_startup(RegistryDB& registry) { const auto ham = registry.Get("select.ini", "General", "Hamiltonian" ); -- GitLab From 9eb9115271e86651d0b3759d880a44d2fd7bb395 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 17 Aug 2021 16:17:14 +0200 Subject: [PATCH 03/25] remove ssh model --- src/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 04c73b4..dea7775 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,7 +51,6 @@ using std::ofstream; #include "hamiltonian/XXZAntiferroSingleAniso.h" #include "hamiltonian/AshkinTeller.h" #include "hamiltonian/EdwardsAndersonIsing.h" -//#include "hamiltonian/Ssh.h" // seperate branch #include "hamiltonian/BlumeCapelBipartite.h" #include "hamiltonian/AshkinTeller.h" -- GitLab From 6d2037615fb9c1d6725de52d4660465abd832ef5 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Tue, 17 Aug 2021 20:59:23 +0200 Subject: [PATCH 04/25] separate ut each model into its own file --- src/main.cpp | 282 ++++++++++++++++++++++++++++----------------------- 1 file changed, 153 insertions(+), 129 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index dea7775..9a5c411 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,7 +71,7 @@ std::string selectsim_startup(RegistryDB& registry) const auto ham = registry.Get("select.ini", "General", "Hamiltonian" ); const auto dim = registry.Get(ham+".ini", ham, "dim" ); const auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); - const auto nreplicass = registry.Get(ham+".ini", ham, "rep" ); + const auto nreplicas_str = registry.Get(ham+".ini", ham, "rep" ); const auto nL = registry.Get>(ham+".ini", ham, "L" ); const auto nLs = registry.Get(ham+".ini", ham, "L" ); @@ -79,92 +79,71 @@ std::string selectsim_startup(RegistryDB& registry) cout << "Hamiltonian: \t" << ham << endl; cout << "Dimension: \t" << dim << endl; cout << "Lattice sizes:\t" << nLs << endl; - cout << "Replicas:\t" << nreplicass << endl; + cout << "Replicas:\t" << nreplicas_str << endl; if ((nreplicas.size() != nL.size()) && (nreplicas.size() != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); return ham; } -/** Select the respective simulation - */ -void selectsim(RegistryDB& registry, int myrank = 0) +void scheduleIsing(RegistryDB& registry, const std::string& outbasedir) { - const auto ham = selectsim_startup(registry); - - std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); - - // delete previous output // fixme: don't do that by default! - std::string command; - command = "rm -r " + outbasedir; - system(command.c_str()); - makeDir(outbasedir); - - - // ----------------- select simulation ------------------ - - if (startswith(ham,"Ising")) - { - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto parameters = cart_prod(beta, J); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - } - - else if (startswith(ham,"Potts")) - { - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto parameters = cart_prod(beta, J); + auto beta = registry.Get >("Ising.ini", "Ising", "beta"); + auto J = registry.Get >("Ising.ini", "Ising", "J"); + auto parameters = cart_prod(beta, J); + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} - switch(registry.Get(ham+".ini", ham, "q")) - { - case 3: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - case 4: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - case 6: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - case 8: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - default: - std::cout<<"[MARQOV::main] Potts: unsupported q!"; - } - } +void schedulePotts(RegistryDB& registry, const std::string& outbasedir) +{ + std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); + auto beta = registry.Get >(ham+".ini", ham, "beta"); + auto J = registry.Get >(ham+".ini", ham, "J"); + auto parameters = cart_prod(beta, J); - else if (ham == "AshkinTeller") - { - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto K = registry.Get >(ham+".ini", ham, "K"); - auto parameters = cart_prod(beta, J, K); + switch(registry.Get(ham+".ini", ham, "q")) + { + case 3: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + case 4: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + case 6: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + case 8: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + default: + std::cout<<"[MARQOV::main] Potts: unsupported q!"; + } +} - RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); - } +void scheduleAshkinTeller(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get >("AshkinTeller.ini", "AshkinTeller", "beta"); + auto J = registry.Get >("AshkinTeller.ini", "AshkinTeller", "J"); + auto K = registry.Get >("AshkinTeller.ini", "AshkinTeller", "K"); + auto parameters = cart_prod(beta, J, K); + RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); +} - else if (ham == "Heisenberg") - { - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); +void scheduleHeisenberg(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get >("Heisenberg.ini", "Heisenberg", "beta"); + auto J = registry.Get >("Heisenberg.ini", "Heisenberg", "J"); auto parameters = cart_prod(beta, J); RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); - } - - - - else if (ham == "Phi4") - { +} - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto lambda = registry.Get >(ham+".ini", ham, "lambda"); - auto mass = registry.Get >(ham+".ini", ham, "mass"); +void schedulePhi4(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get >("Phi4.ini", "Phi4", "beta"); + auto lambda = registry.Get >("Phi4.ini", "Phi4", "lambda"); + auto mass = registry.Get >("Phi4.ini", "Phi4", "mass"); // we need "beta" as an explicit parameter in the Hamiltonian // this requires some gymnastics ... @@ -174,62 +153,53 @@ void selectsim(RegistryDB& registry, int myrank = 0) std::get<1>(parameters[i]) = std::get<0>(parameters[i]); RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); - } - - +} - else if (ham == "BlumeCapel") - { - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto D = registry.Get >(ham+".ini", ham, "D"); +void scheduleBlumeCapel(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get >("BlumeCapel.ini", "BlumeCapel", "beta"); + auto J = registry.Get >("BlumeCapel.ini", "BlumeCapel", "J"); + auto D = registry.Get >("BlumeCapel.ini", "BlumeCapel", "D"); auto parameters = cart_prod(beta, J, D); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - } - + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} - else if (ham == "BlumeEmeryGriffiths") - { - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto D = registry.Get >(ham+".ini", ham, "D"); - auto K = registry.Get >(ham+".ini", ham, "K"); +void scheduleBlumeEmeryGriffiths(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "beta"); + auto J = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "J"); + auto D = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "D"); + auto K = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "K"); auto parameters = cart_prod(beta, J, D, K); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - } - + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} - else if (ham == "XXZAntiferro") - { - auto beta = registry.Get>(ham+".ini", ham, "beta"); - auto extfield = registry.Get>(ham+".ini", ham, "extfield"); - auto aniso = registry.Get>(ham+".ini", ham, "aniso"); +void scheduleXXZAntiferro(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "beta"); + auto extfield = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "extfield"); + auto aniso = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "aniso"); auto parameters = cart_prod(beta, aniso, extfield); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - } - + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} - else if (ham == "XXZAntiferroSingleAniso") - { - auto beta = registry.Get>(ham+".ini", ham, "beta"); - auto extfield = registry.Get>(ham+".ini", ham, "extfield"); - auto aniso = registry.Get>(ham+".ini", ham, "aniso"); - auto singleaniso = registry.Get>(ham+".ini", ham, "singleaniso"); +void scheduleXXZAntiferroSingleAniso(RegistryDB& registry, const std::string outbasedir) +{ + auto beta = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "beta"); + auto extfield = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "extfield"); + auto aniso = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "aniso"); + auto singleaniso = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "singleaniso"); auto parameters = cart_prod(beta, extfield, aniso, singleaniso); RegularLatticeLoop>(registry, outbasedir, parameters, xxzfilter); - } - +} - else if (startswith(ham, "EdwardsAnderson-Ising")) - { - // Parameters +void scheduleEdwardsAndersonIsing(RegistryDB& registry, const std::string outbasedir) +{ +// Parameters const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); @@ -254,7 +224,6 @@ void selectsim(RegistryDB& registry, int myrank = 0) auto J = registry.Get >("mc.ini", "IsingCC", "J"); auto hp = cart_prod(beta, J); - // Typedefs typedef EdwardsAndersonIsing Hamiltonian; typedef RegularRandomBond Lattice; @@ -281,21 +250,18 @@ void selectsim(RegistryDB& registry, int myrank = 0) mp.setwarmupsteps(200); mp.setgameloopsteps(1000); - // lattice parameters -// auto lp = std::make_tuple(L, dim); - // form parameter triple and replicate - auto params = finalize_parameter(std::make_tuple(L, dim), mp, hp);//this particular form is required to happify PGI-19.10 + auto params = finalize_parameter(std::make_tuple(L, dim)/*lattice parameters*/, mp, hp);//this particular form is required to happify PGI-19.10 auto rparams = replicator(params, nreplicas[j]); // schedule simulations for (auto p: rparams) sched.createSimfromParameter(p, defaultfilter); } sched.start(); // run! - } +} - else if (ham == "IsingCC") - { +void scheduleIsingCC(RegistryDB& registry, const std::string outbasedir) +{ // Parameters const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); auto nreplicas = registry.Get>("mc.ini", name, "rep" ); @@ -360,10 +326,10 @@ void selectsim(RegistryDB& registry, int myrank = 0) // run! sched.start(); } - } +} - else if (ham == "BlumeCapelBipartite") - { +void scheduleBlumeCapelBiPartite(RegistryDB& registry, const std::string outbasedir) +{ // Parameters const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); auto nreplicas = registry.Get>("mc.ini", name, "rep" ); @@ -388,10 +354,10 @@ void selectsim(RegistryDB& registry, int myrank = 0) // import parameters - auto beta = registry.Get >("mc.ini", ham, "beta"); - auto J = registry.Get >("mc.ini", ham, "J"); - auto DA = registry.Get >("mc.ini", ham, "DA"); - auto DB = registry.Get >("mc.ini", ham, "DB"); + auto beta = registry.Get >("mc.ini", "BlumeCapelBipartite", "beta"); + auto J = registry.Get >("mc.ini", "BlumeCapelBipartite", "J"); + auto DA = registry.Get >("mc.ini", "BlumeCapelBipartite", "DA"); + auto DB = registry.Get >("mc.ini", "BlumeCapelBipartite", "DB"); auto hp = cart_prod(beta, J, DA, DB); typedef BlumeCapelBipartite Hamiltonian; @@ -435,7 +401,65 @@ void selectsim(RegistryDB& registry, int myrank = 0) for(auto p: rparams) sched.createSimfromParameter(p, defaultfilter); } sched.start(); - } +} + +/** Select the respective simulation. + * + * @param registry The registry object that we will use + * @param myrank the rank to use for some I/O preparation + */ +void selectsim(RegistryDB& registry, int myrank = 0) +{ + const auto ham = selectsim_startup(registry); + + std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + + // delete previous output // fixme: don't do that by default! + if(myrank == 0) + { + std::cout<<"[MARQOV::main] Erasing previous data!!!!!!!!!!!!!!!"< Date: Wed, 18 Aug 2021 04:09:29 +0200 Subject: [PATCH 05/25] Add a fileexists function --- src/libmarqov/core.h | 2 +- src/libmarqov/util/systemtools.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libmarqov/core.h b/src/libmarqov/core.h index 1bef375..2a8e9e8 100644 --- a/src/libmarqov/core.h +++ b/src/libmarqov/core.h @@ -732,7 +732,7 @@ class Core : public RefType static bool dumppresent(const Config& mc) { std::string filepath = mc.outpath + mc.outname + ".h5"; - return std::ifstream(filepath).good() && H5::H5File::isHdf5(filepath); + return fileexists(filepath) && H5::H5File::isHdf5(filepath); } /** This function sets up the layout of the HDF5 Container. diff --git a/src/libmarqov/util/systemtools.h b/src/libmarqov/util/systemtools.h index 48026c0..1770df0 100644 --- a/src/libmarqov/util/systemtools.h +++ b/src/libmarqov/util/systemtools.h @@ -20,6 +20,18 @@ #include #include #include +#include + +/** Check if file exists + * + * This checks wether the file can be opened + * @param fn the filename + * @return true if it can be opened, else false + */ +inline bool fileexists(const std::string& fn) +{ + return std::ifstream(fn).good(); +} /** Create Directory. * -- GitLab From 8ae27c73ce0c59c1724adfa92868c222b59c46db Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 18 Aug 2021 04:09:41 +0200 Subject: [PATCH 06/25] current reworking --- src/main.cpp | 86 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9a5c411..9626e23 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,10 +66,14 @@ bool startswith(const std::string& longword, const std::string& shortword) noexc return longword.find(shortword) == 0; } -std::string selectsim_startup(RegistryDB& registry) +void checkreplicaconfig(int nr, int nL) { - const auto ham = registry.Get("select.ini", "General", "Hamiltonian" ); - const auto dim = registry.Get(ham+".ini", ham, "dim" ); + if ((nr != nL) && (nr != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); +} + +void printInfoandcheckreplicaconfig(RegistryDB& registry, const std::string& ham) +{ + const auto dim = registry.Get(ham+".ini", ham, "dim" ); const auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); const auto nreplicas_str = registry.Get(ham+".ini", ham, "rep" ); const auto nL = registry.Get>(ham+".ini", ham, "L" ); @@ -80,14 +84,13 @@ std::string selectsim_startup(RegistryDB& registry) cout << "Dimension: \t" << dim << endl; cout << "Lattice sizes:\t" << nLs << endl; cout << "Replicas:\t" << nreplicas_str << endl; - - if ((nreplicas.size() != nL.size()) && (nreplicas.size() != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); - - return ham; + + checkreplicaconfig(nreplicas.size(), nL.size()); } void scheduleIsing(RegistryDB& registry, const std::string& outbasedir) { + printInfoandcheckreplicaconfig(registry, "Ising"); auto beta = registry.Get >("Ising.ini", "Ising", "beta"); auto J = registry.Get >("Ising.ini", "Ising", "J"); auto parameters = cart_prod(beta, J); @@ -97,6 +100,7 @@ void scheduleIsing(RegistryDB& registry, const std::string& outbasedir) void schedulePotts(RegistryDB& registry, const std::string& outbasedir) { std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); + printInfoandcheckreplicaconfig(registry, ham); auto beta = registry.Get >(ham+".ini", ham, "beta"); auto J = registry.Get >(ham+".ini", ham, "J"); auto parameters = cart_prod(beta, J); @@ -122,6 +126,7 @@ void schedulePotts(RegistryDB& registry, const std::string& outbasedir) void scheduleAshkinTeller(RegistryDB& registry, const std::string outbasedir) { + printInfoandcheckreplicaconfig(registry, "AshkinTeller"); auto beta = registry.Get >("AshkinTeller.ini", "AshkinTeller", "beta"); auto J = registry.Get >("AshkinTeller.ini", "AshkinTeller", "J"); auto K = registry.Get >("AshkinTeller.ini", "AshkinTeller", "K"); @@ -132,15 +137,17 @@ void scheduleAshkinTeller(RegistryDB& registry, const std::string outbasedir) void scheduleHeisenberg(RegistryDB& registry, const std::string outbasedir) { - auto beta = registry.Get >("Heisenberg.ini", "Heisenberg", "beta"); - auto J = registry.Get >("Heisenberg.ini", "Heisenberg", "J"); - auto parameters = cart_prod(beta, J); - - RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); + printInfoandcheckreplicaconfig(registry, "Heisenberg"); + auto beta = registry.Get >("Heisenberg.ini", "Heisenberg", "beta"); + auto J = registry.Get >("Heisenberg.ini", "Heisenberg", "J"); + auto parameters = cart_prod(beta, J); + + RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); } void schedulePhi4(RegistryDB& registry, const std::string outbasedir) { + printInfoandcheckreplicaconfig(registry, "Phi4"); auto beta = registry.Get >("Phi4.ini", "Phi4", "beta"); auto lambda = registry.Get >("Phi4.ini", "Phi4", "lambda"); auto mass = registry.Get >("Phi4.ini", "Phi4", "mass"); @@ -157,16 +164,18 @@ void schedulePhi4(RegistryDB& registry, const std::string outbasedir) void scheduleBlumeCapel(RegistryDB& registry, const std::string outbasedir) { - auto beta = registry.Get >("BlumeCapel.ini", "BlumeCapel", "beta"); - auto J = registry.Get >("BlumeCapel.ini", "BlumeCapel", "J"); - auto D = registry.Get >("BlumeCapel.ini", "BlumeCapel", "D"); - auto parameters = cart_prod(beta, J, D); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + printInfoandcheckreplicaconfig(registry, "BlumeCapel"); + auto beta = registry.Get >("BlumeCapel.ini", "BlumeCapel", "beta"); + auto J = registry.Get >("BlumeCapel.ini", "BlumeCapel", "J"); + auto D = registry.Get >("BlumeCapel.ini", "BlumeCapel", "D"); + auto parameters = cart_prod(beta, J, D); + + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); } void scheduleBlumeEmeryGriffiths(RegistryDB& registry, const std::string outbasedir) { + printInfoandcheckreplicaconfig(registry, "BlumeEmeryGriffiths"); auto beta = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "beta"); auto J = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "J"); auto D = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "D"); @@ -178,6 +187,7 @@ void scheduleBlumeEmeryGriffiths(RegistryDB& registry, const std::string outbase void scheduleXXZAntiferro(RegistryDB& registry, const std::string outbasedir) { + printInfoandcheckreplicaconfig(registry, "XXZAntiferro"); auto beta = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "beta"); auto extfield = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "extfield"); auto aniso = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "aniso"); @@ -188,6 +198,7 @@ void scheduleXXZAntiferro(RegistryDB& registry, const std::string outbasedir) void scheduleXXZAntiferroSingleAniso(RegistryDB& registry, const std::string outbasedir) { + printInfoandcheckreplicaconfig(registry, "XXZAntiferroSingleAniso"); auto beta = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "beta"); auto extfield = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "extfield"); auto aniso = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "aniso"); @@ -204,7 +215,7 @@ void scheduleEdwardsAndersonIsing(RegistryDB& registry, const std::string outbas auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); const auto dim = registry.Get("mc.ini", name, "dim" ); - + printInfoandcheckreplicaconfig(registry, name); // Number of threads int nthreads = 0; @@ -267,8 +278,8 @@ void scheduleIsingCC(RegistryDB& registry, const std::string outbasedir) auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); const auto dim = registry.Get("mc.ini", name, "dim" ); - - + printInfoandcheckreplicaconfig(registry, name); + // Number of threads int nthreads = 0; try @@ -335,8 +346,8 @@ void scheduleBlumeCapelBiPartite(RegistryDB& registry, const std::string outbase auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); const auto dim = registry.Get("mc.ini", name, "dim" ); - - + printInfoandcheckreplicaconfig(registry, name); + // Number of threads int nthreads = 0; try @@ -410,7 +421,7 @@ void scheduleBlumeCapelBiPartite(RegistryDB& registry, const std::string outbase */ void selectsim(RegistryDB& registry, int myrank = 0) { - const auto ham = selectsim_startup(registry); + const auto ham = registry.Get("select.ini", "General", "Hamiltonian" ); std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); @@ -472,13 +483,36 @@ int main(int argc, char* argv[]) MPI_Init_thread(&argc, &argv, MPI_THREAD_SERIALIZED, &threadingsupport);//FIXME: maybe we get by with one level less. if(threadingsupport < MPI_THREAD_SERIALIZED) { - std::cout<<"[MARQOV] Couldn't initialize MPI! threading level not supported."< Date: Wed, 18 Aug 2021 04:47:25 +0200 Subject: [PATCH 07/25] first instance of self-generating config files --- src/main.cpp | 130 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 87 insertions(+), 43 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9626e23..4d80d3a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,6 +71,24 @@ void checkreplicaconfig(int nr, int nL) if ((nr != nL) && (nr != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); } +void tidyupoldsims(const std::string& outbasedir) +{ + // delete previous output // fixme: don't do that by default! +#ifdef MPIMARQOV + int myrank = 0; + MPI_Comm_rank(MPI_COMM_WORLD, &myrank); + if(myrank == 0) + { +#endif + std::cout<<"[MARQOV::main] Erasing previous data!!!!!!!!!!!!!!!"<(ham+".ini", ham, "dim" ); @@ -88,8 +106,24 @@ void printInfoandcheckreplicaconfig(RegistryDB& registry, const std::string& ham checkreplicaconfig(nreplicas.size(), nL.size()); } -void scheduleIsing(RegistryDB& registry, const std::string& outbasedir) +void scheduleIsing(RegistryDB& registry) { + std::string outbasedir; + try + { + outbasedir = registry.Get("Ising.ini", "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Ising config! Generating new one in ./config/Ising.ini"<("Ising.ini", "IO", "outdir" ); + } + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "Ising"); auto beta = registry.Get >("Ising.ini", "Ising", "beta"); auto J = registry.Get >("Ising.ini", "Ising", "J"); @@ -97,9 +131,11 @@ void scheduleIsing(RegistryDB& registry, const std::string& outbasedir) RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); } -void schedulePotts(RegistryDB& registry, const std::string& outbasedir) +void schedulePotts(RegistryDB& registry) { std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, ham); auto beta = registry.Get >(ham+".ini", ham, "beta"); auto J = registry.Get >(ham+".ini", ham, "J"); @@ -124,8 +160,10 @@ void schedulePotts(RegistryDB& registry, const std::string& outbasedir) } } -void scheduleAshkinTeller(RegistryDB& registry, const std::string outbasedir) +void scheduleAshkinTeller(RegistryDB& registry) { + std::string outbasedir = registry.Get("AshkinTeller.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "AshkinTeller"); auto beta = registry.Get >("AshkinTeller.ini", "AshkinTeller", "beta"); auto J = registry.Get >("AshkinTeller.ini", "AshkinTeller", "J"); @@ -135,8 +173,10 @@ void scheduleAshkinTeller(RegistryDB& registry, const std::string outbasedir) RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); } -void scheduleHeisenberg(RegistryDB& registry, const std::string outbasedir) +void scheduleHeisenberg(RegistryDB& registry) { + std::string outbasedir = registry.Get("Heisenberg.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "Heisenberg"); auto beta = registry.Get >("Heisenberg.ini", "Heisenberg", "beta"); auto J = registry.Get >("Heisenberg.ini", "Heisenberg", "J"); @@ -145,8 +185,10 @@ void scheduleHeisenberg(RegistryDB& registry, const std::string outbasedir) RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); } -void schedulePhi4(RegistryDB& registry, const std::string outbasedir) +void schedulePhi4(RegistryDB& registry) { + std::string outbasedir = registry.Get("Phi4.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "Phi4"); auto beta = registry.Get >("Phi4.ini", "Phi4", "beta"); auto lambda = registry.Get >("Phi4.ini", "Phi4", "lambda"); @@ -162,8 +204,10 @@ void schedulePhi4(RegistryDB& registry, const std::string outbasedir) RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); } -void scheduleBlumeCapel(RegistryDB& registry, const std::string outbasedir) +void scheduleBlumeCapel(RegistryDB& registry) { + std::string outbasedir = registry.Get("BlumeCapel.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "BlumeCapel"); auto beta = registry.Get >("BlumeCapel.ini", "BlumeCapel", "beta"); auto J = registry.Get >("BlumeCapel.ini", "BlumeCapel", "J"); @@ -173,8 +217,10 @@ void scheduleBlumeCapel(RegistryDB& registry, const std::string outbasedir) RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); } -void scheduleBlumeEmeryGriffiths(RegistryDB& registry, const std::string outbasedir) +void scheduleBlumeEmeryGriffiths(RegistryDB& registry) { + std::string outbasedir = registry.Get("BlumeEmeryGriffiths.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "BlumeEmeryGriffiths"); auto beta = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "beta"); auto J = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "J"); @@ -185,8 +231,10 @@ void scheduleBlumeEmeryGriffiths(RegistryDB& registry, const std::string outbase RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); } -void scheduleXXZAntiferro(RegistryDB& registry, const std::string outbasedir) +void scheduleXXZAntiferro(RegistryDB& registry) { + std::string outbasedir = registry.Get("XXZAntiferro.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "XXZAntiferro"); auto beta = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "beta"); auto extfield = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "extfield"); @@ -196,8 +244,10 @@ void scheduleXXZAntiferro(RegistryDB& registry, const std::string outbasedir) RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); } -void scheduleXXZAntiferroSingleAniso(RegistryDB& registry, const std::string outbasedir) +void scheduleXXZAntiferroSingleAniso(RegistryDB& registry) { + std::string outbasedir = registry.Get("XXZAntiferroSingleAniso.ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "XXZAntiferroSingleAniso"); auto beta = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "beta"); auto extfield = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "extfield"); @@ -208,10 +258,12 @@ void scheduleXXZAntiferroSingleAniso(RegistryDB& registry, const std::string out RegularLatticeLoop>(registry, outbasedir, parameters, xxzfilter); } -void scheduleEdwardsAndersonIsing(RegistryDB& registry, const std::string outbasedir) +void scheduleEdwardsAndersonIsing(RegistryDB& registry) { // Parameters - const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); const auto dim = registry.Get("mc.ini", name, "dim" ); @@ -271,10 +323,12 @@ void scheduleEdwardsAndersonIsing(RegistryDB& registry, const std::string outbas sched.start(); // run! } -void scheduleIsingCC(RegistryDB& registry, const std::string outbasedir) +void scheduleIsingCC(RegistryDB& registry) { // Parameters - const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); const auto dim = registry.Get("mc.ini", name, "dim" ); @@ -339,10 +393,12 @@ void scheduleIsingCC(RegistryDB& registry, const std::string outbasedir) } } -void scheduleBlumeCapelBiPartite(RegistryDB& registry, const std::string outbasedir) +void scheduleBlumeCapelBiPartite(RegistryDB& registry) { - // Parameters - const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + // Parameters + const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); auto nreplicas = registry.Get>("mc.ini", name, "rep" ); const auto nL = registry.Get>("mc.ini", name, "L" ); const auto dim = registry.Get("mc.ini", name, "dim" ); @@ -417,60 +473,48 @@ void scheduleBlumeCapelBiPartite(RegistryDB& registry, const std::string outbase /** Select the respective simulation. * * @param registry The registry object that we will use - * @param myrank the rank to use for some I/O preparation */ -void selectsim(RegistryDB& registry, int myrank = 0) +void selectsim(RegistryDB& registry) { const auto ham = registry.Get("select.ini", "General", "Hamiltonian" ); - std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); - - // delete previous output // fixme: don't do that by default! - if(myrank == 0) - { - std::cout<<"[MARQOV::main] Erasing previous data!!!!!!!!!!!!!!!"< Date: Wed, 18 Aug 2021 11:26:59 +0200 Subject: [PATCH 08/25] add config file generation for Potts Model --- src/main.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 4d80d3a..4c9def9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -134,7 +134,22 @@ void scheduleIsing(RegistryDB& registry) void schedulePotts(RegistryDB& registry) { std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); - std::string outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + std::string outbasedir; + try + { + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + int q = std::stoi(ham.substr(5)); + std::cout<<"[MARQOV] Unable to find"<(ham + ".ini", "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, ham); auto beta = registry.Get >(ham+".ini", ham, "beta"); -- GitLab From b39fa102d9a05886b6da1afaf0aa0a3183baab78 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 18 Aug 2021 12:39:51 +0200 Subject: [PATCH 09/25] Add more auto-generated config --- src/main.cpp | 142 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 116 insertions(+), 26 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 4c9def9..d51a638 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -119,7 +119,7 @@ void scheduleIsing(RegistryDB& registry) ofstream ising("./config/Ising.ini"); ising<<"[Ising]\n"<<"L = 10\n"<<"rep = 2\n"<<"dim = 2\n"<<"beta = 0.3, 0.4\n"<<"J = -1.0\n"; ising<<"[MC]\n"<<"nmetro = 10\n"<<"nclusteramp = 25\n"<<"nclusterexp = 0\n"<<"warmupsteps = 30\n"<<"measuresteps = 30\n"; - ising<<"[IO]\n"<<"outdir = ../out\n"<<"[END]\n"<("Ising.ini", "IO", "outdir" ); } @@ -143,10 +143,10 @@ void schedulePotts(RegistryDB& registry) { int q = std::stoi(ham.substr(5)); std::cout<<"[MARQOV] Unable to find"<(ham + ".ini", "IO", "outdir" ); } @@ -177,12 +177,27 @@ void schedulePotts(RegistryDB& registry) void scheduleAshkinTeller(RegistryDB& registry) { - std::string outbasedir = registry.Get("AshkinTeller.ini", "IO", "outdir" ); + const std::string fn{"Ashkin-Teller.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Ashkin-Teller config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "AshkinTeller"); - auto beta = registry.Get >("AshkinTeller.ini", "AshkinTeller", "beta"); - auto J = registry.Get >("AshkinTeller.ini", "AshkinTeller", "J"); - auto K = registry.Get >("AshkinTeller.ini", "AshkinTeller", "K"); + auto beta = registry.Get >(fn, "AshkinTeller", "beta"); + auto J = registry.Get >(fn, "AshkinTeller", "J"); + auto K = registry.Get >(fn, "AshkinTeller", "K"); auto parameters = cart_prod(beta, J, K); RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); @@ -190,11 +205,26 @@ void scheduleAshkinTeller(RegistryDB& registry) void scheduleHeisenberg(RegistryDB& registry) { - std::string outbasedir = registry.Get("Heisenberg.ini", "IO", "outdir" ); + const std::string fn{"Heisenberg.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Heisenberg config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "Heisenberg"); - auto beta = registry.Get >("Heisenberg.ini", "Heisenberg", "beta"); - auto J = registry.Get >("Heisenberg.ini", "Heisenberg", "J"); + auto beta = registry.Get >(fn, "Heisenberg", "beta"); + auto J = registry.Get >(fn, "Heisenberg", "J"); auto parameters = cart_prod(beta, J); RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); @@ -202,12 +232,27 @@ void scheduleHeisenberg(RegistryDB& registry) void schedulePhi4(RegistryDB& registry) { - std::string outbasedir = registry.Get("Phi4.ini", "IO", "outdir" ); + const std::string fn{"Phi4.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Phi4 config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "Phi4"); - auto beta = registry.Get >("Phi4.ini", "Phi4", "beta"); - auto lambda = registry.Get >("Phi4.ini", "Phi4", "lambda"); - auto mass = registry.Get >("Phi4.ini", "Phi4", "mass"); + auto beta = registry.Get >(fn, "Phi4", "beta"); + auto lambda = registry.Get >(fn, "Phi4", "lambda"); + auto mass = registry.Get >(fn, "Phi4", "mass"); // we need "beta" as an explicit parameter in the Hamiltonian // this requires some gymnastics ... @@ -221,12 +266,27 @@ void schedulePhi4(RegistryDB& registry) void scheduleBlumeCapel(RegistryDB& registry) { - std::string outbasedir = registry.Get("BlumeCapel.ini", "IO", "outdir" ); + const std::string fn{"BlumeCapel.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find BlumeCapel config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "BlumeCapel"); - auto beta = registry.Get >("BlumeCapel.ini", "BlumeCapel", "beta"); - auto J = registry.Get >("BlumeCapel.ini", "BlumeCapel", "J"); - auto D = registry.Get >("BlumeCapel.ini", "BlumeCapel", "D"); + auto beta = registry.Get >(fn, "BlumeCapel", "beta"); + auto J = registry.Get >(fn, "BlumeCapel", "J"); + auto D = registry.Get >(fn, "BlumeCapel", "D"); auto parameters = cart_prod(beta, J, D); RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); @@ -234,13 +294,28 @@ void scheduleBlumeCapel(RegistryDB& registry) void scheduleBlumeEmeryGriffiths(RegistryDB& registry) { - std::string outbasedir = registry.Get("BlumeEmeryGriffiths.ini", "IO", "outdir" ); + const std::string fn{"BlumeEmeryGriffiths.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find BlumeEmeryGriffiths config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "BlumeEmeryGriffiths"); - auto beta = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "beta"); - auto J = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "J"); - auto D = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "D"); - auto K = registry.Get >("BlumeEmeryGriffiths.ini", "BlumeEmeryGriffiths", "K"); + auto beta = registry.Get >(fn, "BlumeEmeryGriffiths", "beta"); + auto J = registry.Get >(fn, "BlumeEmeryGriffiths", "J"); + auto D = registry.Get >(fn, "BlumeEmeryGriffiths", "D"); + auto K = registry.Get >(fn, "BlumeEmeryGriffiths", "K"); auto parameters = cart_prod(beta, J, D, K); RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); @@ -248,7 +323,22 @@ void scheduleBlumeEmeryGriffiths(RegistryDB& registry) void scheduleXXZAntiferro(RegistryDB& registry) { - std::string outbasedir = registry.Get("XXZAntiferro.ini", "IO", "outdir" ); + const std::string fn{"XXZAntiferro.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find XXZAntiferro config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "XXZAntiferro"); auto beta = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "beta"); -- GitLab From 994fbc0e633eeebf1e07976f62a404acae44f71c Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 18 Aug 2021 13:14:13 +0200 Subject: [PATCH 10/25] reduce redundancy --- src/main.cpp | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d51a638..3c7050c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -106,6 +106,12 @@ void printInfoandcheckreplicaconfig(RegistryDB& registry, const std::string& ham checkreplicaconfig(nreplicas.size(), nL.size()); } +void createcfgfooter(std::ostream& os, int nmetro, double nclusteramp, int nclusterexp, int warmupsteps, int measuresteps) +{ + os<<"[MC]\n"<<"nmetro = "<("Ising.ini", "IO", "outdir" ); } @@ -144,9 +149,8 @@ void schedulePotts(RegistryDB& registry) int q = std::stoi(ham.substr(5)); std::cout<<"[MARQOV] Unable to find"<(ham + ".ini", "IO", "outdir" ); } @@ -187,9 +191,8 @@ void scheduleAshkinTeller(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find Ashkin-Teller config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } @@ -215,9 +218,8 @@ void scheduleHeisenberg(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find Heisenberg config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } @@ -242,9 +244,8 @@ void schedulePhi4(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find Phi4 config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } @@ -276,9 +277,8 @@ void scheduleBlumeCapel(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find BlumeCapel config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } @@ -304,9 +304,8 @@ void scheduleBlumeEmeryGriffiths(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find BlumeEmeryGriffiths config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } @@ -334,8 +333,7 @@ void scheduleXXZAntiferro(RegistryDB& registry) std::cout<<"[MARQOV] Unable to find XXZAntiferro config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } -- GitLab From a1e51fce9e94103cc06e4d693580757d60fb8993 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 18 Aug 2021 13:26:05 +0200 Subject: [PATCH 11/25] complete Auto-generation --- src/main.cpp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 3c7050c..f19dd6c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -277,7 +277,7 @@ void scheduleBlumeCapel(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find BlumeCapel config! Generating new one in ./config/"<(fn, "IO", "outdir" ); @@ -332,7 +332,7 @@ void scheduleXXZAntiferro(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find XXZAntiferro config! Generating new one in ./config/"<(fn, "IO", "outdir" ); @@ -349,13 +349,27 @@ void scheduleXXZAntiferro(RegistryDB& registry) void scheduleXXZAntiferroSingleAniso(RegistryDB& registry) { - std::string outbasedir = registry.Get("XXZAntiferroSingleAniso.ini", "IO", "outdir" ); + const std::string fn{"XXZAntiferroSingleAniso.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find XXZAntiferroSingleAniso config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "XXZAntiferroSingleAniso"); - auto beta = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "beta"); - auto extfield = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "extfield"); - auto aniso = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "aniso"); - auto singleaniso = registry.Get>("XXZAntiferroSingleAniso.ini", "XXZAntiferroSingleAniso", "singleaniso"); + auto beta = registry.Get>(fn, "XXZAntiferroSingleAniso", "beta"); + auto extfield = registry.Get>(fn, "XXZAntiferroSingleAniso", "extfield"); + auto aniso = registry.Get>(fn, "XXZAntiferroSingleAniso", "aniso"); + auto singleaniso = registry.Get>(fn, "XXZAntiferroSingleAniso", "singleaniso"); auto parameters = cart_prod(beta, extfield, aniso, singleaniso); RegularLatticeLoop>(registry, outbasedir, parameters, xxzfilter); -- GitLab From c368d76e8fe72b43aa95189900d6c2dda858a1d1 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 18 Aug 2021 13:31:20 +0200 Subject: [PATCH 12/25] some docs --- src/main.cpp | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index f19dd6c..92dab46 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,11 +66,21 @@ bool startswith(const std::string& longword, const std::string& shortword) noexc return longword.find(shortword) == 0; } +/** Check the vailidity of the replica configuration. + * throws if invalid. + * + * @param nr number of replicas + * @param nL amount of lattice simulations + */ void checkreplicaconfig(int nr, int nL) { if ((nr != nL) && (nr != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); } +/** Removes previous simulations. + * + * @param outbasedir The folder that we remove entirely + */ void tidyupoldsims(const std::string& outbasedir) { // delete previous output // fixme: don't do that by default! @@ -89,6 +99,11 @@ void tidyupoldsims(const std::string& outbasedir) #endif } +/** Print some nice information + * + * @param registry Where to get the data from. + * @param ham the hamiltonian + */ void printInfoandcheckreplicaconfig(RegistryDB& registry, const std::string& ham) { const auto dim = registry.Get(ham+".ini", ham, "dim" ); @@ -106,6 +121,14 @@ void printInfoandcheckreplicaconfig(RegistryDB& registry, const std::string& ham checkreplicaconfig(nreplicas.size(), nL.size()); } +/** Utility function to write the common part of the config file + * @param os the stream associated with the new config file. + * @param nmetro + * @param nclusteramp + * @param nclusterexp + * @param warmupsteps + * @param measuresteps + */ void createcfgfooter(std::ostream& os, int nmetro, double nclusteramp, int nclusterexp, int warmupsteps, int measuresteps) { os<<"[MC]\n"<<"nmetro = "< Date: Wed, 18 Aug 2021 13:35:25 +0200 Subject: [PATCH 13/25] fix a PGI warning --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 92dab46..771179a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -697,8 +697,8 @@ int main(int argc, char* argv[]) throw; } } - int myrank = 0; #ifdef MPIMARQOV + int myrank = 0; MPI_Comm_rank(MPI_COMM_WORLD, &myrank); if (myrank == 0) { #endif -- GitLab From 92fe3cb5ab1c336915580dd14a73bf76e1737258 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 18 Aug 2021 15:48:49 +0200 Subject: [PATCH 14/25] a number of fixes --- src/main.cpp | 111 +++++++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 47 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 92dab46..9791ef7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -135,30 +135,38 @@ void createcfgfooter(std::ostream& os, int nmetro, double nclusteramp, int nclus os<<"[IO]\n"<<"outdir = ../out\n"<<"[END]"<("select.ini", "General", "Hamiltonian" ); std::string outbasedir; try { - outbasedir = registry.Get("Ising.ini", "IO", "outdir" ); + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); } catch(Registry_cfgfile_not_found_Exception& e) { - std::cout<<"[MARQOV] Unable to find Ising config! Generating new one in ./config/Ising.ini"<("Ising.ini", "IO", "outdir" ); + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, "Ising"); - auto beta = registry.Get >("Ising.ini", "Ising", "beta"); - auto J = registry.Get >("Ising.ini", "Ising", "J"); + auto beta = registry.Get >(ham+".ini", ham, "beta"); + auto J = registry.Get >(ham+".ini", ham, "J"); auto parameters = cart_prod(beta, J); RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); } + + + void schedulePotts(RegistryDB& registry) { std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); @@ -171,11 +179,11 @@ void schedulePotts(RegistryDB& registry) { int q = std::stoi(ham.substr(5)); std::cout<<"[MARQOV] Unable to find"<(ham + ".ini", "IO", "outdir" ); + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, ham); @@ -202,33 +210,38 @@ void schedulePotts(RegistryDB& registry) } } + + void scheduleAshkinTeller(RegistryDB& registry) { - const std::string fn{"Ashkin-Teller.ini"}; + std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); std::string outbasedir; try { - outbasedir = registry.Get(fn, "IO", "outdir" ); + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); } catch(Registry_cfgfile_not_found_Exception& e) { - std::cout<<"[MARQOV] Unable to find Ashkin-Teller config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); } tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "AshkinTeller"); - auto beta = registry.Get >(fn, "AshkinTeller", "beta"); - auto J = registry.Get >(fn, "AshkinTeller", "J"); - auto K = registry.Get >(fn, "AshkinTeller", "K"); + printInfoandcheckreplicaconfig(registry, ham); + auto beta = registry.Get >(ham+".ini", "AshkinTeller", "beta"); + auto J = registry.Get >(ham+".ini", "AshkinTeller", "J"); + auto K = registry.Get >(ham+".ini", "AshkinTeller", "K"); auto parameters = cart_prod(beta, J, K); RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); } + + + void scheduleHeisenberg(RegistryDB& registry) { const std::string fn{"Heisenberg.ini"}; @@ -398,22 +411,23 @@ void scheduleXXZAntiferroSingleAniso(RegistryDB& registry) RegularLatticeLoop>(registry, outbasedir, parameters, xxzfilter); } +/* void scheduleEdwardsAndersonIsing(RegistryDB& registry) { // Parameters - const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + const auto name = registry.Get(ham+".ini", "General", "Hamiltonian" ); std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); tidyupoldsims(outbasedir); - auto nreplicas = registry.Get>("mc.ini", name, "rep" ); - const auto nL = registry.Get>("mc.ini", name, "L" ); - const auto dim = registry.Get("mc.ini", name, "dim" ); + auto nreplicas = registry.Get>(ham+".ini", name, "rep" ); + const auto nL = registry.Get>(ham+".ini", name, "L" ); + const auto dim = registry.Get(ham+".ini", name, "dim" ); printInfoandcheckreplicaconfig(registry, name); // Number of threads int nthreads = 0; try { - nthreads = registry.template Get("mc.ini", "General", "threads_per_node" ); + nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); } catch (const Registry_Key_not_found_Exception&) { @@ -423,8 +437,8 @@ void scheduleEdwardsAndersonIsing(RegistryDB& registry) if (nreplicas.size() == 1) { for (decltype(nL.size()) i=0; i >("mc.ini", "IsingCC", "beta"); - auto J = registry.Get >("mc.ini", "IsingCC", "J"); + auto beta = registry.Get >(ham+".ini", "IsingCC", "beta"); + auto J = registry.Get >(ham+".ini", "IsingCC", "J"); auto hp = cart_prod(beta, J); // Typedefs @@ -454,7 +468,7 @@ void scheduleEdwardsAndersonIsing(RegistryDB& registry) mp.setgameloopsteps(1000); // form parameter triple and replicate - auto params = finalize_parameter(std::make_tuple(L, dim)/*lattice parameters*/, mp, hp);//this particular form is required to happify PGI-19.10 + auto params = finalize_parameter(std::make_tuple(L, dim), mp, hp);//this particular form is required to happify PGI-19.10 auto rparams = replicator(params, nreplicas[j]); // schedule simulations @@ -462,23 +476,25 @@ void scheduleEdwardsAndersonIsing(RegistryDB& registry) } sched.start(); // run! } +*/ +/* void scheduleIsingCC(RegistryDB& registry) { // Parameters - const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); + const auto name = registry.Get(ham+".ini", "General", "Hamiltonian" ); std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); tidyupoldsims(outbasedir); - auto nreplicas = registry.Get>("mc.ini", name, "rep" ); - const auto nL = registry.Get>("mc.ini", name, "L" ); - const auto dim = registry.Get("mc.ini", name, "dim" ); + auto nreplicas = registry.Get>(ham+".ini", name, "rep" ); + const auto nL = registry.Get>(ham+".ini", name, "L" ); + const auto dim = registry.Get(ham+".ini", name, "dim" ); printInfoandcheckreplicaconfig(registry, name); // Number of threads int nthreads = 0; try { - nthreads = registry.template Get("mc.ini", "General", "threads_per_node" ); + nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); } catch (const Registry_Key_not_found_Exception&) { @@ -490,8 +506,8 @@ void scheduleIsingCC(RegistryDB& registry) if (nreplicas.size() == 1) { for (decltype(nL.size()) i=0; i >("mc.ini", "IsingCC", "beta"); - auto J = registry.Get >("mc.ini", "IsingCC", "J"); + auto beta = registry.Get >(ham+".ini", "IsingCC", "beta"); + auto J = registry.Get >(ham+".ini", "IsingCC", "J"); auto hp = cart_prod(beta, J); // Typedefs @@ -532,23 +548,24 @@ void scheduleIsingCC(RegistryDB& registry) sched.start(); } } +*/ void scheduleBlumeCapelBiPartite(RegistryDB& registry) { // Parameters - const auto name = registry.Get("mc.ini", "General", "Hamiltonian" ); - std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); + const auto ham = registry.Get("select.ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(ham + ".ini", "IO", "outdir" ); tidyupoldsims(outbasedir); - auto nreplicas = registry.Get>("mc.ini", name, "rep" ); - const auto nL = registry.Get>("mc.ini", name, "L" ); - const auto dim = registry.Get("mc.ini", name, "dim" ); - printInfoandcheckreplicaconfig(registry, name); + auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); + const auto nL = registry.Get>(ham+".ini", ham, "L" ); + const auto dim = registry.Get(ham+".ini", ham, "dim" ); + printInfoandcheckreplicaconfig(registry, ham); // Number of threads int nthreads = 0; try { - nthreads = registry.template Get("mc.ini", "General", "threads_per_node" ); + nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); } catch (const Registry_Key_not_found_Exception&) { @@ -561,10 +578,10 @@ void scheduleBlumeCapelBiPartite(RegistryDB& registry) // import parameters - auto beta = registry.Get >("mc.ini", "BlumeCapelBipartite", "beta"); - auto J = registry.Get >("mc.ini", "BlumeCapelBipartite", "J"); - auto DA = registry.Get >("mc.ini", "BlumeCapelBipartite", "DA"); - auto DB = registry.Get >("mc.ini", "BlumeCapelBipartite", "DB"); + auto beta = registry.Get >(ham+".ini", "BlumeCapelBipartite", "beta"); + auto J = registry.Get >(ham+".ini", "BlumeCapelBipartite", "J"); + auto DA = registry.Get >(ham+".ini", "BlumeCapelBipartite", "DA"); + auto DB = registry.Get >(ham+".ini", "BlumeCapelBipartite", "DB"); auto hp = cart_prod(beta, J, DA, DB); typedef BlumeCapelBipartite Hamiltonian; @@ -647,11 +664,11 @@ void selectsim(RegistryDB& registry) else if (ham == "XXZAntiferroSingleAniso") scheduleXXZAntiferroSingleAniso(registry); - else if (startswith(ham, "EdwardsAnderson-Ising")) - scheduleEdwardsAndersonIsing(registry); +// else if (startswith(ham, "EdwardsAnderson-Ising")) +// scheduleEdwardsAndersonIsing(registry); - else if (ham == "IsingCC") - scheduleIsingCC(registry); +// else if (ham == "IsingCC") +// scheduleIsingCC(registry); else if (ham == "BlumeCapelBipartite") scheduleBlumeCapelBiPartite(registry); -- GitLab From 77dd2d8ebe0af6a0ce737a3c8ec316b873fff35e Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 18 Aug 2021 15:58:44 +0200 Subject: [PATCH 15/25] minor changes --- src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b03ecee..2c2e91b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -223,17 +223,17 @@ void scheduleAshkinTeller(RegistryDB& registry) catch(Registry_cfgfile_not_found_Exception& e) { std::cout << "[MARQOV] Unable to find Ashkin-Teller config! Generating new one in ./config/"+ham+".ini" << std::endl; - ofstream cfg("./config/" + ham+".ini"); - cfg<<"[AshkinTeller]\n"<<"L = 12\n"<<"rep = 10\n"<<"dim = 2\n"<<"beta = 0.312, 0.313\n"<<"J = -1.0\n"<<"K = 0.3\n\n"; + ofstream cfg("./config/"+ham+".ini"); + cfg<<"["+ham+"]\n"<<"L = 12\n"<<"rep = 10\n"<<"dim = 2\n"<<"beta = 0.312, 0.313\n"<<"J = -1.0\n"<<"K = 0.3\n\n"; createcfgfooter(cfg, 2, 25, 0, 500, 10000); registry.init("./config"); outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); } tidyupoldsims(outbasedir); printInfoandcheckreplicaconfig(registry, ham); - auto beta = registry.Get >(ham+".ini", "AshkinTeller", "beta"); - auto J = registry.Get >(ham+".ini", "AshkinTeller", "J"); - auto K = registry.Get >(ham+".ini", "AshkinTeller", "K"); + auto beta = registry.Get >(ham+".ini", ham, "beta"); + auto J = registry.Get >(ham+".ini", ham, "J"); + auto K = registry.Get >(ham+".ini", ham, "K"); auto parameters = cart_prod(beta, J, K); RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); -- GitLab From 5d88fecfa5ceebe26af6539e079b99119f5c9751 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 18 Aug 2021 16:41:22 +0000 Subject: [PATCH 16/25] sync with Manuels BEG config --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2c2e91b..077cccf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -340,8 +340,8 @@ void scheduleBlumeEmeryGriffiths(RegistryDB& registry) { std::cout<<"[MARQOV] Unable to find BlumeEmeryGriffiths config! Generating new one in ./config/"<(fn, "IO", "outdir" ); } -- GitLab From c0f1f50bd2b7b2d9f94f3e8309299e9223ac1b60 Mon Sep 17 00:00:00 2001 From: Manuel Date: Thu, 19 Aug 2021 19:01:04 +0200 Subject: [PATCH 17/25] move things around --- CMakeLists.txt | 1 + Examples/Regular2DHeisenberg/cfgs/Heisenberg | 4 - Examples/Regular2DHeisenberg/cfgs/mc | 10 - demo/CMakeLists.txt | 55 ++ demo/MARQOVdemo.cpp | 727 ++++++++++++++++++ {src => demo}/mysimpleheisenbergthreaded.cpp | 6 +- {src => demo}/mysimpleising.cpp | 8 +- src/CMakeLists.txt | 49 +- src/libmarqov/CMakeLists.txt | 10 +- src/main.cpp | 765 ++----------------- 10 files changed, 870 insertions(+), 765 deletions(-) delete mode 100644 Examples/Regular2DHeisenberg/cfgs/Heisenberg delete mode 100644 Examples/Regular2DHeisenberg/cfgs/mc create mode 100644 demo/CMakeLists.txt create mode 100644 demo/MARQOVdemo.cpp rename {src => demo}/mysimpleheisenbergthreaded.cpp (95%) rename {src => demo}/mysimpleising.cpp (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4903deb..0d98def 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ if(DEBIASINTEGERS AND NOT HAVE_UINT128LEN) endif() add_subdirectory(src) +add_subdirectory(demo) #add_subdirectory(testsuite) #enable_testing() diff --git a/Examples/Regular2DHeisenberg/cfgs/Heisenberg b/Examples/Regular2DHeisenberg/cfgs/Heisenberg deleted file mode 100644 index bc68816..0000000 --- a/Examples/Regular2DHeisenberg/cfgs/Heisenberg +++ /dev/null @@ -1,4 +0,0 @@ -[General] -beta = 0.5 - -[END] \ No newline at end of file diff --git a/Examples/Regular2DHeisenberg/cfgs/mc b/Examples/Regular2DHeisenberg/cfgs/mc deleted file mode 100644 index e6df89f..0000000 --- a/Examples/Regular2DHeisenberg/cfgs/mc +++ /dev/null @@ -1,10 +0,0 @@ -[General] -nL = 12,14,16,18,20 -betastart = 0.5 -betaend = 0.8 -nbeta = 12 - -[IO] -logfilename = logfile.txt - -[END] \ No newline at end of file diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt new file mode 100644 index 0000000..9331d92 --- /dev/null +++ b/demo/CMakeLists.txt @@ -0,0 +1,55 @@ +INCLUDE(CheckFunctionExists) + +#add_subdirectory(../src/libmarqov) + +# configuration for the simple ising test case +add_executable(mysimpleising mysimpleising.cpp) +target_include_directories(mysimpleising PUBLIC ${MYHDF5INCLUDES}) +target_link_libraries(mysimpleising libMARQOV) +set_target_properties(mysimpleising PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) + +# configuration for the Heisenberg test case with threading +add_executable(mysimpleheisenbergthreaded mysimpleheisenbergthreaded.cpp) +target_include_directories(mysimpleheisenbergthreaded PUBLIC ${MYHDF5INCLUDES}) +target_link_libraries(mysimpleheisenbergthreaded libMARQOV) +set_target_properties(mysimpleheisenbergthreaded PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) + + +# configuration of the main parts. + +SET(MARQOVTARGETS MARQOVdemo mpiMARQOVdemo) + +foreach(target ${MARQOVTARGETS}) + add_executable (${target} ../src/libmarqov/util/registry.cpp MARQOVdemo.cpp) + target_link_libraries(${target} libMARQOV) + set_target_properties(${target} PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) + + set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMPILE_FLAGS " ${COMPILE_FLAGS} -DHAVE_CONFIG_H -DGIT_SHA1=\"${GIT_SHA1}\" -DGIT_BRANCH=\"${GIT_BRANCH}\"" ) + +endforeach(target) + + +find_package(MPI) +if(MPI_CXX_FOUND) + target_compile_options(mpiMARQOV PUBLIC -DMPIMARQOV) + if(CMAKE_VERSION VERSION_LESS 3.10) + target_include_directories(mpiMARQOV PUBLIC ${MPI_INCLUDE_PATH}) + target_link_libraries(mpiMARQOV ${MPI_CXX_LIBRARIES}) + target_compile_options(mpiMARQOV PUBLIC ${MPI_CXX_COMPILE_FLAGS}) + else() + target_include_directories(mpiMARQOV PUBLIC ${MPI_CXX_INCLUDE_DIRS}) + target_link_libraries(mpiMARQOV ${MPI_CXX_LIBRARIES}) + set_target_properties(mpiMARQOV PROPERTIES LINK_FLAGS " ${LINK_FLAGS} ${MPI_CXX_LINK_FLAGS}") + target_compile_options(mpiMARQOV PUBLIC ${MPI_CXX_COMPILE_OPTIONS}) + target_compile_definitions(mpiMARQOV PUBLIC ${MPI_CXX_COMPILE_DEFINITIONS}) + + endif() +endif(MPI_CXX_FOUND) + +CHECK_FUNCTION_EXISTS(scandir HAVE_SCANDIR) + +CHECK_FUNCTION_EXISTS(alphasort HAVE_ALPHASORT) + +CHECK_FUNCTION_EXISTS(readdir_r HAVE_READDIR_R) + +#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libmarqov/util/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/libmarqov/util/config.h) diff --git a/demo/MARQOVdemo.cpp b/demo/MARQOVdemo.cpp new file mode 100644 index 0000000..a469709 --- /dev/null +++ b/demo/MARQOVdemo.cpp @@ -0,0 +1,727 @@ +/* MARQOV - A modern framework for classical spin models on general topologies + * Copyright (C) 2020-2021, The MARQOV Project + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using std::cout; +using std::endl; +using std::flush; +using std::ofstream; + +// MARQOV +#include "../src/libmarqov/libmarqov.h" + +// Lattices +#include "../src/lattice/regular_hypercubic.h" +#include "../src/lattice/constant_coordination.h" +#include "../src/lattice/regular_random_bond.h" +#include "../src/lattice/simple_bipartite.h" + + +// Hamiltonians +#include "../src/hamiltonian/Heisenberg.h" +#include "../src/hamiltonian/Ising.h" +#include "../src/hamiltonian/Potts.h" +#include "../src/hamiltonian/Phi4.h" +#include "../src/hamiltonian/BlumeCapel.h" +#include "../src/hamiltonian/BlumeEmeryGriffiths.h" +#include "../src/hamiltonian/XXZAntiferro.h" +#include "../src/hamiltonian/XXZAntiferroSingleAniso.h" +#include "../src/hamiltonian/AshkinTeller.h" +#include "../src/hamiltonian/EdwardsAndersonIsing.h" +#include "../src/hamiltonian/BlumeCapelBipartite.h" +#include "../src/hamiltonian/AshkinTeller.h" + +using namespace MARQOV; + +/** Find out if a string starts with something. + * @param longword we search in this string + * @param shortword we look for this + * @return truen if longword strarts with shortword, else false + */ +bool startswith(const std::string& longword, const std::string& shortword) noexcept +{ + return longword.find(shortword) == 0; +} + +/** Check the vailidity of the replica configuration. + * throws if invalid. + * + * @param nr number of replicas + * @param nL amount of lattice simulations + */ +void checkreplicaconfig(int nr, int nL) +{ + if ((nr != nL) && (nr != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); +} + +/** Removes previous simulations. + * + * @param outbasedir The folder that we remove entirely + */ +void tidyupoldsims(const std::string& outbasedir) +{ + // delete previous output // fixme: don't do that by default! +#ifdef MPIMARQOV + int myrank = 0; + MPI_Comm_rank(MPI_COMM_WORLD, &myrank); + if(myrank == 0) + { +#endif + std::cout<<"[MARQOV::main] Erasing previous data!!!!!!!!!!!!!!!"<(ham+".ini", ham, "dim" ); + const auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); + const auto nreplicas_str = registry.Get(ham+".ini", ham, "rep" ); + const auto nL = registry.Get>(ham+".ini", ham, "L" ); + const auto nLs = registry.Get(ham+".ini", ham, "L" ); + + cout << endl; + cout << "Hamiltonian: \t" << ham << endl; + cout << "Dimension: \t" << dim << endl; + cout << "Lattice sizes:\t" << nLs << endl; + cout << "Replicas:\t" << nreplicas_str << endl; + + checkreplicaconfig(nreplicas.size(), nL.size()); +} + +/** Utility function to write the common part of the config file + * @param os the stream associated with the new config file. + * @param nmetro + * @param nclusteramp + * @param nclusterexp + * @param warmupsteps + * @param measuresteps + */ +void createcfgfooter(std::ostream& os, int nmetro, double nclusteramp, int nclusterexp, int warmupsteps, int measuresteps) +{ + os<<"[MC]\n"<<"nmetro = "<("select.ini", "General", "Hamiltonian" ); + std::string outbasedir; + try + { + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Ising config! Generating new one in ./config/"+ham+".ini"<(ham+".ini", "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "Ising"); + auto beta = registry.Get >(ham+".ini", ham, "beta"); + auto J = registry.Get >(ham+".ini", ham, "J"); + auto parameters = cart_prod(beta, J); + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} + + + + +void schedulePotts(RegistryDB& registry) +{ + std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); + std::string outbasedir; + try + { + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + int q = std::stoi(ham.substr(5)); + std::cout<<"[MARQOV] Unable to find"<(ham+".ini", "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, ham); + auto beta = registry.Get >(ham+".ini", ham, "beta"); + auto J = registry.Get >(ham+".ini", ham, "J"); + auto parameters = cart_prod(beta, J); + + switch(registry.Get(ham+".ini", ham, "q")) + { + case 3: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + case 4: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + case 6: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + case 8: + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); + break; + default: + std::cout<<"[MARQOV::main] Potts: unsupported q!"; + } +} + + + +void scheduleAshkinTeller(RegistryDB& registry) +{ + std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); + std::string outbasedir; + try + { + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout << "[MARQOV] Unable to find Ashkin-Teller config! Generating new one in ./config/"+ham+".ini" << std::endl; + ofstream cfg("./config/"+ham+".ini"); + cfg<<"["+ham+"]\n"<<"L = 12\n"<<"rep = 10\n"<<"dim = 2\n"<<"beta = 0.312, 0.313\n"<<"J = -1.0\n"<<"K = 0.3\n\n"; + createcfgfooter(cfg, 2, 25, 0, 500, 10000); + registry.init("./config"); + outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, ham); + auto beta = registry.Get >(ham+".ini", ham, "beta"); + auto J = registry.Get >(ham+".ini", ham, "J"); + auto K = registry.Get >(ham+".ini", ham, "K"); + auto parameters = cart_prod(beta, J, K); + + RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); +} + + + + +void scheduleHeisenberg(RegistryDB& registry) +{ + const std::string fn{"Heisenberg.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Heisenberg config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "Heisenberg"); + auto beta = registry.Get >(fn, "Heisenberg", "beta"); + auto J = registry.Get >(fn, "Heisenberg", "J"); + auto parameters = cart_prod(beta, J); + + RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); +} + +void schedulePhi4(RegistryDB& registry) +{ + const std::string fn{"Phi4.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find Phi4 config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "Phi4"); + auto beta = registry.Get >(fn, "Phi4", "beta"); + auto lambda = registry.Get >(fn, "Phi4", "lambda"); + auto mass = registry.Get >(fn, "Phi4", "mass"); + + // we need "beta" as an explicit parameter in the Hamiltonian + // this requires some gymnastics ... + std::vector dummy = {0.0}; + auto parameters = cart_prod(beta, dummy, lambda, mass); + for (std::size_t i=0; i(parameters[i]) = std::get<0>(parameters[i]); + + RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); +} + +void scheduleBlumeCapel(RegistryDB& registry) +{ + const std::string fn{"BlumeCapel.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find BlumeCapel config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "BlumeCapel"); + auto beta = registry.Get >(fn, "BlumeCapel", "beta"); + auto J = registry.Get >(fn, "BlumeCapel", "J"); + auto D = registry.Get >(fn, "BlumeCapel", "D"); + auto parameters = cart_prod(beta, J, D); + + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} + +void scheduleBlumeEmeryGriffiths(RegistryDB& registry) +{ + const std::string fn{"BlumeEmeryGriffiths.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find BlumeEmeryGriffiths config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "BlumeEmeryGriffiths"); + auto beta = registry.Get >(fn, "BlumeEmeryGriffiths", "beta"); + auto J = registry.Get >(fn, "BlumeEmeryGriffiths", "J"); + auto D = registry.Get >(fn, "BlumeEmeryGriffiths", "D"); + auto K = registry.Get >(fn, "BlumeEmeryGriffiths", "K"); + auto parameters = cart_prod(beta, J, D, K); + + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} + +void scheduleXXZAntiferro(RegistryDB& registry) +{ + const std::string fn{"XXZAntiferro.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find XXZAntiferro config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "XXZAntiferro"); + auto beta = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "beta"); + auto extfield = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "extfield"); + auto aniso = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "aniso"); + auto parameters = cart_prod(beta, aniso, extfield); + + RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); +} + +void scheduleXXZAntiferroSingleAniso(RegistryDB& registry) +{ + const std::string fn{"XXZAntiferroSingleAniso.ini"}; + std::string outbasedir; + try + { + outbasedir = registry.Get(fn, "IO", "outdir" ); + } + catch(Registry_cfgfile_not_found_Exception& e) + { + std::cout<<"[MARQOV] Unable to find XXZAntiferroSingleAniso config! Generating new one in ./config/"<(fn, "IO", "outdir" ); + } + tidyupoldsims(outbasedir); + printInfoandcheckreplicaconfig(registry, "XXZAntiferroSingleAniso"); + auto beta = registry.Get>(fn, "XXZAntiferroSingleAniso", "beta"); + auto extfield = registry.Get>(fn, "XXZAntiferroSingleAniso", "extfield"); + auto aniso = registry.Get>(fn, "XXZAntiferroSingleAniso", "aniso"); + auto singleaniso = registry.Get>(fn, "XXZAntiferroSingleAniso", "singleaniso"); + auto parameters = cart_prod(beta, extfield, aniso, singleaniso); + + RegularLatticeLoop>(registry, outbasedir, parameters, xxzfilter); +} + +/* +void scheduleEdwardsAndersonIsing(RegistryDB& registry) +{ +// Parameters + const auto name = registry.Get(ham+".ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); + auto nreplicas = registry.Get>(ham+".ini", name, "rep" ); + const auto nL = registry.Get>(ham+".ini", name, "L" ); + const auto dim = registry.Get(ham+".ini", name, "dim" ); + printInfoandcheckreplicaconfig(registry, name); + + // Number of threads + int nthreads = 0; + try + { + nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); + } + catch (const Registry_Key_not_found_Exception&) + { + std::cout<<"threads_per_node not set -> automatic"< >(ham+".ini", "IsingCC", "beta"); + auto J = registry.Get >(ham+".ini", "IsingCC", "J"); + auto hp = cart_prod(beta, J); + + // Typedefs + typedef EdwardsAndersonIsing Hamiltonian; + typedef RegularRandomBond Lattice; + //typedef RegularRandomBond Lattice; + + typedef std::tuple, MARQOV::Config, typename decltype(hp)::value_type > ParameterType; + typedef typename GetSchedulerType::MarqovScheduler SchedulerType; + + SchedulerType sched(1, nthreads); + + // Lattice size loop + for (std::size_t j=0; j(ham+".ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); + auto nreplicas = registry.Get>(ham+".ini", name, "rep" ); + const auto nL = registry.Get>(ham+".ini", name, "L" ); + const auto dim = registry.Get(ham+".ini", name, "dim" ); + printInfoandcheckreplicaconfig(registry, name); + + // Number of threads + int nthreads = 0; + try + { + nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); + } + catch (const Registry_Key_not_found_Exception&) + { + std::cout<<"threads_per_node not set -> automatic"< >(ham+".ini", "IsingCC", "beta"); + auto J = registry.Get >(ham+".ini", "IsingCC", "J"); + auto hp = cart_prod(beta, J); + + // Typedefs + typedef Ising Hamiltonian; + typedef ConstantCoordinationLattice Lattice; + + typedef std::tuple, MARQOV::Config, typename decltype(hp)::value_type > ParameterType; + typedef typename GetSchedulerType::MarqovScheduler SchedulerType; + + + // Lattice size loop + for (std::size_t j=0; j("select.ini", "General", "Hamiltonian" ); + std::string outbasedir = registry.Get(ham + ".ini", "IO", "outdir" ); + tidyupoldsims(outbasedir); + auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); + const auto nL = registry.Get>(ham+".ini", ham, "L" ); + const auto dim = registry.Get(ham+".ini", ham, "dim" ); + printInfoandcheckreplicaconfig(registry, ham); + + // Number of threads + int nthreads = 0; + try + { + nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); + } + catch (const Registry_Key_not_found_Exception&) + { + std::cout<<"threads_per_node not set -> automatic"< >(ham+".ini", "BlumeCapelBipartite", "beta"); + auto J = registry.Get >(ham+".ini", "BlumeCapelBipartite", "J"); + auto DA = registry.Get >(ham+".ini", "BlumeCapelBipartite", "DA"); + auto DB = registry.Get >(ham+".ini", "BlumeCapelBipartite", "DB"); + auto hp = cart_prod(beta, J, DA, DB); + + typedef BlumeCapelBipartite Hamiltonian; + typedef SimpleBipartite Lattice; + + typedef typename std::tuple > ParameterType; + typedef typename GetSchedulerType::MarqovScheduler SchedulerType; + + // Prepare Geometry + std::vector latts; + for (std::size_t j=0; j("select.ini", "General", "Hamiltonian" ); + + // ----------------- select simulation ------------------ + + if (startswith(ham, "Ising")) + scheduleIsing(registry); + + else if (startswith(ham, "Potts")) + schedulePotts(registry); + + else if (ham == "AshkinTeller") + scheduleAshkinTeller(registry); + + else if (ham == "Heisenberg") + scheduleHeisenberg(registry); + + else if (ham == "Phi4") + schedulePhi4(registry); + + else if (ham == "BlumeCapel") + scheduleBlumeCapel(registry); + + else if (ham == "BlumeEmeryGriffiths") + scheduleBlumeEmeryGriffiths(registry); + + else if (ham == "XXZAntiferro") + scheduleXXZAntiferro(registry); + + else if (ham == "XXZAntiferroSingleAniso") + scheduleXXZAntiferroSingleAniso(registry); + +// else if (startswith(ham, "EdwardsAnderson-Ising")) +// scheduleEdwardsAndersonIsing(registry); + +// else if (ham == "IsingCC") +// scheduleIsingCC(registry); + + else if (ham == "BlumeCapelBipartite") + scheduleBlumeCapelBiPartite(registry); +} + +int main(int argc, char* argv[]) +{ + std::cout<<"MARQOV Copyright (C) 2020-2021, The MARQOV Project contributors"< //include the MARQOV library -#include "libmarqov/libmarqov.h" +#include "../src/libmarqov/libmarqov.h" //include the RegularLattice -#include "lattice/regular_hypercubic.h" +#include "../src/lattice/regular_hypercubic.h" //include some predefined observables, e.g. the magnetization and the energy -#include "hamiltonian/util/observables.h" +#include "../src/hamiltonian/util/observables.h" // Define interaction term for the Heisenberg model diff --git a/src/mysimpleising.cpp b/demo/mysimpleising.cpp similarity index 92% rename from src/mysimpleising.cpp rename to demo/mysimpleising.cpp index 6cd24a7..c59db78 100644 --- a/src/mysimpleising.cpp +++ b/demo/mysimpleising.cpp @@ -2,15 +2,15 @@ #include // include the MARQOV library -#include "libmarqov/libmarqov.h" +#include "../src/libmarqov/libmarqov.h" // include the RegularLattice -#include "lattice/regular_hypercubic.h" +#include "../src/lattice/regular_hypercubic.h" // include certain hamiltonian building blocks from the utilities -#include "hamiltonian/util/termcollection.h" +#include "../src/hamiltonian/util/termcollection.h" // include some predefined observables, e.g. the magnetization and the energy -#include "hamiltonian/util/observables.h" +#include "../src/hamiltonian/util/observables.h" class MySimpleIsing { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3313aa2..1b9e2f9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,48 +2,13 @@ INCLUDE(CheckFunctionExists) add_subdirectory(libmarqov) -# configuration for the simple ising test case -add_executable(mysimpleising mysimpleising.cpp libmarqov/marqov.cpp) -target_include_directories(mysimpleising PUBLIC ${MYHDF5INCLUDES}) -target_link_libraries(mysimpleising libmarqov) -set_target_properties(mysimpleising PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) - -# configuration for the Heisenberg test case with threading -add_executable(mysimpleheisenbergthreaded mysimpleheisenbergthreaded.cpp libmarqov/marqov.cpp) -target_include_directories(mysimpleheisenbergthreaded PUBLIC ${MYHDF5INCLUDES}) -target_link_libraries(mysimpleheisenbergthreaded libmarqov) -set_target_properties(mysimpleheisenbergthreaded PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) - -# configuration of the main parts. - -SET(MARQOVTARGETS MARQOV mpiMARQOV) - -foreach(target ${MARQOVTARGETS}) - add_executable (${target} libmarqov/util/registry.cpp main.cpp) - target_link_libraries(${target} libmarqov) - set_target_properties(${target} PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) - - set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMPILE_FLAGS " ${COMPILE_FLAGS} -DHAVE_CONFIG_H -DGIT_SHA1=\"${GIT_SHA1}\" -DGIT_BRANCH=\"${GIT_BRANCH}\"" ) - -endforeach(target) - - -find_package(MPI) -if(MPI_CXX_FOUND) - target_compile_options(mpiMARQOV PUBLIC -DMPIMARQOV) - if(CMAKE_VERSION VERSION_LESS 3.10) - target_include_directories(mpiMARQOV PUBLIC ${MPI_INCLUDE_PATH}) - target_link_libraries(mpiMARQOV ${MPI_CXX_LIBRARIES}) - target_compile_options(mpiMARQOV PUBLIC ${MPI_CXX_COMPILE_FLAGS}) - else() - target_include_directories(mpiMARQOV PUBLIC ${MPI_CXX_INCLUDE_DIRS}) - target_link_libraries(mpiMARQOV ${MPI_CXX_LIBRARIES}) - set_target_properties(mpiMARQOV PROPERTIES LINK_FLAGS " ${LINK_FLAGS} ${MPI_CXX_LINK_FLAGS}") - target_compile_options(mpiMARQOV PUBLIC ${MPI_CXX_COMPILE_OPTIONS}) - target_compile_definitions(mpiMARQOV PUBLIC ${MPI_CXX_COMPILE_DEFINITIONS}) - - endif() -endif(MPI_CXX_FOUND) + +# configuration for the main file +add_executable(main main.cpp libmarqov/util/registry.cpp) +target_include_directories(main PUBLIC ${MYHDF5INCLUDES}) +target_link_libraries(main libMARQOV) +set_target_properties(main PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) + CHECK_FUNCTION_EXISTS(scandir HAVE_SCANDIR) diff --git a/src/libmarqov/CMakeLists.txt b/src/libmarqov/CMakeLists.txt index 81959a2..422a65c 100644 --- a/src/libmarqov/CMakeLists.txt +++ b/src/libmarqov/CMakeLists.txt @@ -46,12 +46,12 @@ if( (NOT HDF5_FOUND) ) endif() endif() -add_library(libmarqov marqov.cpp) -target_include_directories(libmarqov PUBLIC ${MYHDF5INCLUDES}) -target_link_libraries(libmarqov ${MYHDF5LIBS} Threads::Threads) -set_target_properties(libmarqov PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) +add_library(libMARQOV marqov.cpp) +target_include_directories(libMARQOV PUBLIC ${MYHDF5INCLUDES}) +target_link_libraries(libMARQOV ${MYHDF5LIBS} Threads::Threads) +set_target_properties(libMARQOV PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES) if(DEBIASINTEGERS) target_compile_definitions("DEBIASINTEGERS") endif() -set_target_properties(libmarqov PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMPILE_FLAGS " ${COMPILE_FLAGS} -DGIT_SHA1=\"${GIT_SHA1}\" -DGIT_BRANCH=\"${GIT_BRANCH}\"" ) +set_target_properties(libMARQOV PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMPILE_FLAGS " ${COMPILE_FLAGS} -DGIT_SHA1=\"${GIT_SHA1}\" -DGIT_BRANCH=\"${GIT_BRANCH}\"" ) diff --git a/src/main.cpp b/src/main.cpp index 077cccf..508880a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,727 +1,98 @@ -/* MARQOV - A modern framework for classical spin models on general topologies - * Copyright (C) 2020-2021, The MARQOV Project - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ - -#include -#include #include -#include -#include -#include -#include +#include #include -#include - -using std::cout; -using std::endl; -using std::flush; -using std::ofstream; +#include -// MARQOV +//include the MARQOV library #include "libmarqov/libmarqov.h" -// Lattices +//include the RegularLattice #include "lattice/regular_hypercubic.h" -#include "lattice/constant_coordination.h" -#include "lattice/regular_random_bond.h" -#include "lattice/simple_bipartite.h" - - -// Hamiltonians -#include "hamiltonian/Heisenberg.h" -#include "hamiltonian/Ising.h" -#include "hamiltonian/Potts.h" -#include "hamiltonian/Phi4.h" -#include "hamiltonian/BlumeCapel.h" -#include "hamiltonian/BlumeEmeryGriffiths.h" -#include "hamiltonian/XXZAntiferro.h" -#include "hamiltonian/XXZAntiferroSingleAniso.h" -#include "hamiltonian/AshkinTeller.h" -#include "hamiltonian/EdwardsAndersonIsing.h" -#include "hamiltonian/BlumeCapelBipartite.h" -#include "hamiltonian/AshkinTeller.h" - -using namespace MARQOV; - -/** Find out if a string starts with something. - * @param longword we search in this string - * @param shortword we look for this - * @return truen if longword strarts with shortword, else false - */ -bool startswith(const std::string& longword, const std::string& shortword) noexcept -{ - return longword.find(shortword) == 0; -} - -/** Check the vailidity of the replica configuration. - * throws if invalid. - * - * @param nr number of replicas - * @param nL amount of lattice simulations - */ -void checkreplicaconfig(int nr, int nL) -{ - if ((nr != nL) && (nr != 1)) throw std::invalid_argument("[MARQOV] Invalid replica configuration!"); -} - -/** Removes previous simulations. - * - * @param outbasedir The folder that we remove entirely - */ -void tidyupoldsims(const std::string& outbasedir) -{ - // delete previous output // fixme: don't do that by default! -#ifdef MPIMARQOV - int myrank = 0; - MPI_Comm_rank(MPI_COMM_WORLD, &myrank); - if(myrank == 0) - { -#endif - std::cout<<"[MARQOV::main] Erasing previous data!!!!!!!!!!!!!!!"<(ham+".ini", ham, "dim" ); - const auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); - const auto nreplicas_str = registry.Get(ham+".ini", ham, "rep" ); - const auto nL = registry.Get>(ham+".ini", ham, "L" ); - const auto nLs = registry.Get(ham+".ini", ham, "L" ); - - cout << endl; - cout << "Hamiltonian: \t" << ham << endl; - cout << "Dimension: \t" << dim << endl; - cout << "Lattice sizes:\t" << nLs << endl; - cout << "Replicas:\t" << nreplicas_str << endl; - - checkreplicaconfig(nreplicas.size(), nL.size()); -} - -/** Utility function to write the common part of the config file - * @param os the stream associated with the new config file. - * @param nmetro - * @param nclusteramp - * @param nclusterexp - * @param warmupsteps - * @param measuresteps - */ -void createcfgfooter(std::ostream& os, int nmetro, double nclusteramp, int nclusterexp, int warmupsteps, int measuresteps) -{ - os<<"[MC]\n"<<"nmetro = "<("select.ini", "General", "Hamiltonian" ); - std::string outbasedir; - try - { - outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find Ising config! Generating new one in ./config/"+ham+".ini"<(ham+".ini", "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "Ising"); - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto parameters = cart_prod(beta, J); - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); -} + public: + MyHeisenberg_interaction(const double J) : J(J) {} + std::array get (const std::array& phi) {return phi;}; + const double J; +}; - - - -void schedulePotts(RegistryDB& registry) +class MySimpleHeisenberg { - std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); - std::string outbasedir; - try - { - outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - int q = std::stoi(ham.substr(5)); - std::cout<<"[MARQOV] Unable to find"<(ham+".ini", "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, ham); - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto parameters = cart_prod(beta, J); - - switch(registry.Get(ham+".ini", ham, "q")) - { - case 3: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - case 4: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - case 6: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - case 8: - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); - break; - default: - std::cout<<"[MARQOV::main] Potts: unsupported q!"; - } -} - - - -void scheduleAshkinTeller(RegistryDB& registry) -{ - std::string ham = registry.Get("select.ini", "General", "Hamiltonian" ); - std::string outbasedir; - try - { - outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout << "[MARQOV] Unable to find Ashkin-Teller config! Generating new one in ./config/"+ham+".ini" << std::endl; - ofstream cfg("./config/"+ham+".ini"); - cfg<<"["+ham+"]\n"<<"L = 12\n"<<"rep = 10\n"<<"dim = 2\n"<<"beta = 0.312, 0.313\n"<<"J = -1.0\n"<<"K = 0.3\n\n"; - createcfgfooter(cfg, 2, 25, 0, 500, 10000); - registry.init("./config"); - outbasedir = registry.Get(ham+".ini", "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, ham); - auto beta = registry.Get >(ham+".ini", ham, "beta"); - auto J = registry.Get >(ham+".ini", ham, "J"); - auto K = registry.Get >(ham+".ini", ham, "K"); - auto parameters = cart_prod(beta, J, K); - - RegularLatticeLoop(registry, outbasedir, parameters, defaultfilter); -} - - - - -void scheduleHeisenberg(RegistryDB& registry) -{ - const std::string fn{"Heisenberg.ini"}; - std::string outbasedir; - try - { - outbasedir = registry.Get(fn, "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find Heisenberg config! Generating new one in ./config/"<(fn, "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "Heisenberg"); - auto beta = registry.Get >(fn, "Heisenberg", "beta"); - auto J = registry.Get >(fn, "Heisenberg", "J"); - auto parameters = cart_prod(beta, J); - - RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); -} - -void schedulePhi4(RegistryDB& registry) -{ - const std::string fn{"Phi4.ini"}; - std::string outbasedir; - try - { - outbasedir = registry.Get(fn, "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find Phi4 config! Generating new one in ./config/"<(fn, "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "Phi4"); - auto beta = registry.Get >(fn, "Phi4", "beta"); - auto lambda = registry.Get >(fn, "Phi4", "lambda"); - auto mass = registry.Get >(fn, "Phi4", "mass"); + public: - // we need "beta" as an explicit parameter in the Hamiltonian - // this requires some gymnastics ... - std::vector dummy = {0.0}; - auto parameters = cart_prod(beta, dummy, lambda, mass); - for (std::size_t i=0; i(parameters[i]) = std::get<0>(parameters[i]); - - RegularLatticeLoop >(registry, outbasedir, parameters, defaultfilter); -} - -void scheduleBlumeCapel(RegistryDB& registry) -{ - const std::string fn{"BlumeCapel.ini"}; - std::string outbasedir; - try - { - outbasedir = registry.Get(fn, "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find BlumeCapel config! Generating new one in ./config/"<(fn, "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "BlumeCapel"); - auto beta = registry.Get >(fn, "BlumeCapel", "beta"); - auto J = registry.Get >(fn, "BlumeCapel", "J"); - auto D = registry.Get >(fn, "BlumeCapel", "D"); - auto parameters = cart_prod(beta, J, D); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); -} - -void scheduleBlumeEmeryGriffiths(RegistryDB& registry) -{ - const std::string fn{"BlumeEmeryGriffiths.ini"}; - std::string outbasedir; - try - { - outbasedir = registry.Get(fn, "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find BlumeEmeryGriffiths config! Generating new one in ./config/"<(fn, "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "BlumeEmeryGriffiths"); - auto beta = registry.Get >(fn, "BlumeEmeryGriffiths", "beta"); - auto J = registry.Get >(fn, "BlumeEmeryGriffiths", "J"); - auto D = registry.Get >(fn, "BlumeEmeryGriffiths", "D"); - auto K = registry.Get >(fn, "BlumeEmeryGriffiths", "K"); - auto parameters = cart_prod(beta, J, D, K); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); -} - -void scheduleXXZAntiferro(RegistryDB& registry) -{ - const std::string fn{"XXZAntiferro.ini"}; - std::string outbasedir; - try - { - outbasedir = registry.Get(fn, "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find XXZAntiferro config! Generating new one in ./config/"<(fn, "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "XXZAntiferro"); - auto beta = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "beta"); - auto extfield = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "extfield"); - auto aniso = registry.Get>("XXZAntiferro.ini", "XXZAntiferro", "aniso"); - auto parameters = cart_prod(beta, aniso, extfield); - - RegularLatticeLoop>(registry, outbasedir, parameters, defaultfilter); -} + // The spin dimension of the Heisenberg or O(3) model + constexpr static int SymD = 3; -void scheduleXXZAntiferroSingleAniso(RegistryDB& registry) -{ - const std::string fn{"XXZAntiferroSingleAniso.ini"}; - std::string outbasedir; - try - { - outbasedir = registry.Get(fn, "IO", "outdir" ); - } - catch(Registry_cfgfile_not_found_Exception& e) - { - std::cout<<"[MARQOV] Unable to find XXZAntiferroSingleAniso config! Generating new one in ./config/"<(fn, "IO", "outdir" ); - } - tidyupoldsims(outbasedir); - printInfoandcheckreplicaconfig(registry, "XXZAntiferroSingleAniso"); - auto beta = registry.Get>(fn, "XXZAntiferroSingleAniso", "beta"); - auto extfield = registry.Get>(fn, "XXZAntiferroSingleAniso", "extfield"); - auto aniso = registry.Get>(fn, "XXZAntiferroSingleAniso", "aniso"); - auto singleaniso = registry.Get>(fn, "XXZAntiferroSingleAniso", "singleaniso"); - auto parameters = cart_prod(beta, extfield, aniso, singleaniso); - - RegularLatticeLoop>(registry, outbasedir, parameters, xxzfilter); -} - -/* -void scheduleEdwardsAndersonIsing(RegistryDB& registry) -{ -// Parameters - const auto name = registry.Get(ham+".ini", "General", "Hamiltonian" ); - std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); - tidyupoldsims(outbasedir); - auto nreplicas = registry.Get>(ham+".ini", name, "rep" ); - const auto nL = registry.Get>(ham+".ini", name, "L" ); - const auto dim = registry.Get(ham+".ini", name, "dim" ); - printInfoandcheckreplicaconfig(registry, name); - - // Number of threads - int nthreads = 0; - try - { - nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); - } - catch (const Registry_Key_not_found_Exception&) - { - std::cout<<"threads_per_node not set -> automatic"< StateVector; - // Physical parameters - auto beta = registry.Get >(ham+".ini", "IsingCC", "beta"); - auto J = registry.Get >(ham+".ini", "IsingCC", "J"); - auto hp = cart_prod(beta, J); - - // Typedefs - typedef EdwardsAndersonIsing Hamiltonian; - typedef RegularRandomBond Lattice; - //typedef RegularRandomBond Lattice; - - typedef std::tuple, MARQOV::Config, typename decltype(hp)::value_type > ParameterType; - typedef typename GetSchedulerType::MarqovScheduler SchedulerType; - - SchedulerType sched(1, nthreads); - - // Lattice size loop - for (std::size_t j=0; j(ham+".ini", "General", "Hamiltonian" ); - std::string outbasedir = registry.Get(name + ".ini", "IO", "outdir" ); - tidyupoldsims(outbasedir); - auto nreplicas = registry.Get>(ham+".ini", name, "rep" ); - const auto nL = registry.Get>(ham+".ini", name, "L" ); - const auto dim = registry.Get(ham+".ini", name, "dim" ); - printInfoandcheckreplicaconfig(registry, name); - - // Number of threads - int nthreads = 0; - try - { - nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); - } - catch (const Registry_Key_not_found_Exception&) - { - std::cout<<"threads_per_node not set -> automatic"< interactions = {new MyHeisenberg_interaction(J)}; + + // Constructor + MySimpleHeisenberg(double J) : J(J), name("MySimpleHeisenberg"), obs_e(*this){} + ~MySimpleHeisenberg() {delete interactions[0];} - // Replicas - if (nreplicas.size() == 1) { for (decltype(nL.size()) i=0; i >(ham+".ini", "IsingCC", "beta"); - auto J = registry.Get >(ham+".ini", "IsingCC", "J"); - auto hp = cart_prod(beta, J); - - // Typedefs - typedef Ising Hamiltonian; - typedef ConstantCoordinationLattice Lattice; - - typedef std::tuple, MARQOV::Config, typename decltype(hp)::value_type > ParameterType; - typedef typename GetSchedulerType::MarqovScheduler SchedulerType; - - - // Lattice size loop - for (std::size_t j=0; j("select.ini", "General", "Hamiltonian" ); - std::string outbasedir = registry.Get(ham + ".ini", "IO", "outdir" ); - tidyupoldsims(outbasedir); - auto nreplicas = registry.Get>(ham+".ini", ham, "rep" ); - const auto nL = registry.Get>(ham+".ini", ham, "L" ); - const auto dim = registry.Get(ham+".ini", ham, "dim" ); - printInfoandcheckreplicaconfig(registry, ham); - - // Number of threads - int nthreads = 0; - try - { - nthreads = registry.template Get(ham+".ini", "General", "threads_per_node" ); - } - catch (const Registry_Key_not_found_Exception&) - { - std::cout<<"threads_per_node not set -> automatic"< >(ham+".ini", "BlumeCapelBipartite", "beta"); - auto J = registry.Get >(ham+".ini", "BlumeCapelBipartite", "J"); - auto DA = registry.Get >(ham+".ini", "BlumeCapelBipartite", "DA"); - auto DB = registry.Get >(ham+".ini", "BlumeCapelBipartite", "DB"); - auto hp = cart_prod(beta, J, DA, DB); - - typedef BlumeCapelBipartite Hamiltonian; - typedef SimpleBipartite Lattice; - - typedef typename std::tuple > ParameterType; - typedef typename GetSchedulerType::MarqovScheduler SchedulerType; + // Observables + Magnetization obs_m; + Energy obs_e; + decltype(std::make_tuple(obs_m, obs_e)) observables = {std::make_tuple(obs_m, obs_e)}; +}; - // Prepare Geometry - std::vector latts; - for (std::size_t j=0; j("select.ini", "General", "Hamiltonian" ); - - // ----------------- select simulation ------------------ - - if (startswith(ham, "Ising")) - scheduleIsing(registry); - - else if (startswith(ham, "Potts")) - schedulePotts(registry); - - else if (ham == "AshkinTeller") - scheduleAshkinTeller(registry); - - else if (ham == "Heisenberg") - scheduleHeisenberg(registry); - - else if (ham == "Phi4") - schedulePhi4(registry); - - else if (ham == "BlumeCapel") - scheduleBlumeCapel(registry); - - else if (ham == "BlumeEmeryGriffiths") - scheduleBlumeEmeryGriffiths(registry); + // Initialize the lattice + int L = 8; + int dim = 2; + RegularHypercubic mylatt(L, dim); - else if (ham == "XXZAntiferro") - scheduleXXZAntiferro(registry); + // Set Monte Carlo parameters using MARQOV::Config + MARQOV::Config mp("./"); // output path + mp.setnmetro(5); // number of Metropolis sweeps per EMCS + mp.setncluster(10); // number of Wolff updates per EMCS + mp.setwarmupsteps(500); // number of EMCS for warmup + mp.setgameloopsteps(3000); // number of EMCS for production - else if (ham == "XXZAntiferroSingleAniso") - scheduleXXZAntiferroSingleAniso(registry); + // Set the Hamiltonian parameters, J, and the inverse temperature beta + double beta = 0.66; + double J = 1; + auto hp = make_tuple(beta, J); -// else if (startswith(ham, "EdwardsAnderson-Ising")) -// scheduleEdwardsAndersonIsing(registry); + // Let's create some parameters tuples, a temperature scan for the scheduler to work on -// else if (ham == "IsingCC") -// scheduleIsingCC(registry); + // Prepare an array of parameter tuples + auto args = make_tuple(std::ref(mylatt), mp, hp); + vector v; - else if (ham == "BlumeCapelBipartite") - scheduleBlumeCapelBiPartite(registry); -} - -int main(int argc, char* argv[]) -{ - std::cout<<"MARQOV Copyright (C) 2020-2021, The MARQOV Project contributors"<::MarqovScheduler SchedulerType; + SchedulerType sched(1); //MARQOV makes use of all available threads by default. + + // Feed parameters to the scheduler which creates the simulations + for(auto p : v) + sched.createSimfromParameter(p); + // Run + sched.start(); } -- GitLab From 273d7ef131c3ff008eec69f4e934145538d2ac31 Mon Sep 17 00:00:00 2001 From: Manuel Date: Thu, 19 Aug 2021 19:05:24 +0200 Subject: [PATCH 18/25] new folder: scripts --- jobitpa.cmd | 24 ------------------- .../compilefulldocs.sh | 0 .../createfulldocs.sh | 0 job_sge.cmd => scripts/job_sge.cmd | 0 job_slurm.cmd => scripts/job_slurm.cmd | 0 5 files changed, 24 deletions(-) delete mode 100644 jobitpa.cmd rename compilefulldocs.sh => scripts/compilefulldocs.sh (100%) rename createfulldocs.sh => scripts/createfulldocs.sh (100%) rename job_sge.cmd => scripts/job_sge.cmd (100%) rename job_slurm.cmd => scripts/job_slurm.cmd (100%) diff --git a/jobitpa.cmd b/jobitpa.cmd deleted file mode 100644 index 7de77ec..0000000 --- a/jobitpa.cmd +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -#$ -S /bin/bash - -# --- MARQOV SGE job script for the ITPA cluster --- -# move to build directory and use qsub to submit - -# start job in current working directory -#$ -cwd - -# Pretend to require so much memory that the SGE is -# forced to spread the MPI process across nodes -#$ -l h_vmem=48G # reduce for mpi16 queue - -# Choose queue and number of MPI processes -#$-pe mpi32* 8 - -# Job name -#$-N MARQOV - -#$ -e ../error.txt -#$ -o ../output.txt - -echo "Starting MARQOV on $NSLOTS nodes!" -mpirun ./src/mpiMARQOV diff --git a/compilefulldocs.sh b/scripts/compilefulldocs.sh similarity index 100% rename from compilefulldocs.sh rename to scripts/compilefulldocs.sh diff --git a/createfulldocs.sh b/scripts/createfulldocs.sh similarity index 100% rename from createfulldocs.sh rename to scripts/createfulldocs.sh diff --git a/job_sge.cmd b/scripts/job_sge.cmd similarity index 100% rename from job_sge.cmd rename to scripts/job_sge.cmd diff --git a/job_slurm.cmd b/scripts/job_slurm.cmd similarity index 100% rename from job_slurm.cmd rename to scripts/job_slurm.cmd -- GitLab From 22030ec01e2781e0036ad4a84ad74aa1b2a92553 Mon Sep 17 00:00:00 2001 From: Manuel Date: Thu, 19 Aug 2021 19:05:56 +0200 Subject: [PATCH 19/25] remove old docs attempts --- docs/Doxyfile-base.cfg | 2618 ------------------------------ docs/Doxyfile-marqov-breathe.cfg | 2 - docs/Doxyfile-marqov.cfg | 35 - docs/exhale/Doxyfile | 18 - docs/exhale/Makefile | 27 - docs/exhale/conf.py | 222 --- docs/exhale/index.rst | 20 - docs/exhale/requirements.txt | 1 - 8 files changed, 2943 deletions(-) delete mode 100644 docs/Doxyfile-base.cfg delete mode 100644 docs/Doxyfile-marqov-breathe.cfg delete mode 100644 docs/Doxyfile-marqov.cfg delete mode 100644 docs/exhale/Doxyfile delete mode 100644 docs/exhale/Makefile delete mode 100644 docs/exhale/conf.py delete mode 100644 docs/exhale/index.rst delete mode 100644 docs/exhale/requirements.txt diff --git a/docs/Doxyfile-base.cfg b/docs/Doxyfile-base.cfg deleted file mode 100644 index b9d2dbb..0000000 --- a/docs/Doxyfile-base.cfg +++ /dev/null @@ -1,2618 +0,0 @@ -# Doxyfile 1.9.1 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the configuration -# file that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# https://www.gnu.org/software/libiconv/ for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "My Project" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = - -# With the PROJECT_LOGO tag one can specify a logo or an icon that is included -# in the documentation. The maximum height of the logo should not exceed 55 -# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy -# the logo to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = - -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all generated output in the proper direction. -# Possible values are: None, LTR, RTL and Context. -# The default value is: None. - -OUTPUT_TEXT_DIRECTION = None - -# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = YES - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line -# such as -# /*************** -# as being the beginning of a Javadoc-style comment "banner". If set to NO, the -# Javadoc-style will behave just like regular comments and it will not be -# interpreted by doxygen. -# The default value is: NO. - -JAVADOC_BANNER = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# By default Python docstrings are displayed as preformatted text and doxygen's -# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the -# doxygen's special commands can be used and the contents of the docstring -# documentation blocks is shown as doxygen documentation. -# The default value is: YES. - -PYTHON_DOCSTRING = YES - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new -# page for each member. If set to NO, the documentation of a member will be part -# of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines (in the resulting output). You can put ^^ in the value part of an -# alias to insert a newline as if a physical newline was in the original file. -# When you need a literal { or } or , in the value part of an alias you have to -# escape them by means of a backslash (\), this can lead to conflicts with the -# commands \{ and \} for these it is advised to use the version @{ and @} or use -# a double escape (\\{ and \\}) - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice -# sources only. Doxygen will then generate output that is more tailored for that -# language. For instance, namespaces will be presented as modules, types will be -# separated into more groups, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_SLICE = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, -# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL, -# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: -# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser -# tries to guess whether the code is fixed or free formatted code, this is the -# default for Fortran type files). For instance to make doxygen treat .inc files -# as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. -# -# Note: For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. When specifying no_extension you should add -# * to the FILE_PATTERNS. -# -# Note see also the list of default file extension mappings. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See https://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 5. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 5 - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# If one adds a struct or class to a group and this option is enabled, then also -# any nested class or struct is added to the same group. By default this option -# is disabled and one has to add nested compounds explicitly via \ingroup. -# The default value is: NO. - -GROUP_NESTED_COMPOUNDS = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use -# during processing. When set to 0 doxygen will based this on the number of -# cores available in the system. You can set it explicitly to a value larger -# than 0 to get more control over the balance between CPU load and processing -# speed. At this moment only the input processing can be done using multiple -# threads. Since this is still an experimental feature the default is set to 1, -# which efficively disables parallel processing. Please report any issues you -# encounter. Generating dot graphs in parallel is controlled by the -# DOT_NUM_THREADS setting. -# Minimum value: 0, maximum value: 32, default value: 1. - -NUM_PROC_THREADS = 1 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual -# methods of a class will be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIV_VIRTUAL = NO - -# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO, -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. If set to YES, local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO, only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If this flag is set to YES, the name of an unnamed parameter in a declaration -# will be determined by the corresponding definition. By default unnamed -# parameters remain unnamed in the output. -# The default value is: YES. - -RESOLVE_UNNAMED_PARAMS = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# declarations. If set to NO, these declarations will be included in the -# documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO, these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# With the correct setting of option CASE_SENSE_NAMES doxygen will better be -# able to match the capabilities of the underlying filesystem. In case the -# filesystem is case sensitive (i.e. it supports files in the same directory -# whose names only differ in casing), the option must be set to YES to properly -# deal with such files in case they appear in the input. For filesystems that -# are not case sensitive the option should be be set to NO to properly deal with -# output files written for symbols that only differ in casing, such as for two -# classes, one named CLASS and the other named Class, and to also support -# references to files without having to specify the exact matching casing. On -# Windows (including Cygwin) and MacOS, users should typically set this option -# to NO, whereas on Linux or other Unix flavors it should typically be set to -# YES. -# The default value is: system dependent. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES, the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will -# append additional text to a page's title, such as Class Reference. If set to -# YES the compound reference will be hidden. -# The default value is: NO. - -HIDE_COMPOUND_REFERENCE= NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo -# list. This list is created by putting \todo commands in the documentation. -# The default value is: YES. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test -# list. This list is created by putting \test commands in the documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES, the -# list will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO, doxygen will only warn about wrong or incomplete -# parameter documentation, but not about the absence of documentation. If -# EXTRACT_ALL is set to YES then this flag will automatically be disabled. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when -# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS -# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but -# at the end of the doxygen process doxygen will return with a non-zero status. -# Possible values are: NO, YES and FAIL_ON_WARNINGS. -# The default value is: NO. - -WARN_AS_ERROR = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING -# Note: If this tag is empty the current directory is searched. - -INPUT = - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: -# https://www.gnu.org/software/libiconv/) for the list of possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# read by doxygen. -# -# Note the list of default checked file patterns might differ from the list of -# default file extension mappings. -# -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, -# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment), -# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl, -# *.ucf, *.qsf and *.ice. - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.idl \ - *.ddl \ - *.odl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.cs \ - *.d \ - *.php \ - *.php4 \ - *.php5 \ - *.phtml \ - *.inc \ - *.m \ - *.markdown \ - *.md \ - *.mm \ - *.dox \ - *.py \ - *.pyw \ - *.f90 \ - *.f95 \ - *.f03 \ - *.f08 \ - *.f18 \ - *.f \ - *.for \ - *.vhd \ - *.vhdl \ - *.ucf \ - *.qsf \ - *.ice - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# entity all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see https://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = YES - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefore more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra style sheet files is of importance (e.g. the last -# style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the style sheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# https://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML -# documentation will contain a main index with vertical navigation menus that -# are dynamically created via JavaScript. If disabled, the navigation index will -# consists of multiple levels of tabs that are statically embedded in every HTML -# page. Disable this option to support browsers that do not have JavaScript, -# like the Qt help browser. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_MENUS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: -# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To -# create a documentation set, doxygen will generate a Makefile in the HTML -# output directory. Running make will produce the docset in that directory and -# running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy -# genXcode/_index.html for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: -# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler (hhc.exe). If non-empty, -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the main .chm file (NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated -# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location (absolute path -# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to -# run qhelpgenerator on the generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg -# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see -# https://inkscape.org) to generate formulas as SVG images instead of PNGs for -# the HTML output. These images will generally look nicer at scaled resolutions. -# Possible values are: png (the default) and svg (looks nicer but requires the -# pdf2svg or inkscape tool). -# The default value is: png. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FORMULA_FORMAT = png - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANSPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - -# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands -# to create new LaTeX commands to be used in formulas as building blocks. See -# the section "Including formulas" for details. - -FORMULA_MACROFILE = - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# https://www.mathjax.org) which uses client side JavaScript for the rendering -# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from https://www.mathjax.org before deployment. -# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = https://cdn.jsdelivr.net/npm/mathjax@2 - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: -# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /