Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
516c356
nexus: update qmcpack input parameters
jtkrogel Aug 19, 2026
26cbc77
nexus: add more names following deeper pass
jtkrogel Aug 21, 2026
748feb0
nexus: further tightening revisions
jtkrogel Aug 21, 2026
501b1e1
rollover legacy deterministic tests to batched
jtkrogel Aug 25, 2026
9daddb6
add reference data
jtkrogel Aug 25, 2026
a54eba9
Merge remote-tracking branch 'main/develop' into add_batched_det_tests
jtkrogel Aug 26, 2026
56b4b16
fix comparisons
jtkrogel Aug 26, 2026
f789091
update mixed prec
jtkrogel Aug 26, 2026
81b2397
fix tolerance
jtkrogel Aug 27, 2026
4485c22
first removal pass
jtkrogel Aug 27, 2026
bceb4fa
second removal pass
jtkrogel Aug 28, 2026
3b395e1
third removal pass
jtkrogel Aug 28, 2026
f28cd84
fourth removal pass
jtkrogel Aug 28, 2026
25e61c0
fifth removal pass
jtkrogel Aug 28, 2026
246e42f
sixth removal pass
jtkrogel Aug 28, 2026
6b58d5f
removal pass 7
jtkrogel Aug 28, 2026
154739b
removal pass 8
jtkrogel Aug 28, 2026
7ae139f
removal pass 9
jtkrogel Aug 28, 2026
33310ae
removal pass 10
jtkrogel Aug 28, 2026
4001b79
removal pass 11
jtkrogel Aug 28, 2026
da36f44
removal pass 12
jtkrogel Aug 28, 2026
c22625c
removal pass 13
jtkrogel Aug 28, 2026
70dc9f9
removal pass 14
jtkrogel Aug 28, 2026
14e9695
removal pass 15
jtkrogel Aug 28, 2026
280049d
removal pass 16
jtkrogel Aug 28, 2026
6696007
removal pass 17
jtkrogel Aug 28, 2026
2b302e3
removal pass 18
jtkrogel Aug 28, 2026
390bbc5
removal pass 19
jtkrogel Aug 28, 2026
19a4641
removal pass 20
jtkrogel Aug 28, 2026
e45984e
removal pass 21
jtkrogel Aug 28, 2026
3d88ca2
removal pass 22
jtkrogel Aug 28, 2026
5a18ddd
removal pass 23
jtkrogel Aug 28, 2026
c44fb95
removal pass 24
jtkrogel Aug 28, 2026
ddcab3a
removal pass 25
jtkrogel Aug 28, 2026
686b28c
removal pass 26
jtkrogel Aug 28, 2026
335e57b
removal pass 27
jtkrogel Aug 28, 2026
89ece81
removal pass 28
jtkrogel Aug 28, 2026
e50ee87
removal pass 29
jtkrogel Aug 28, 2026
dc630b7
removal pass 30
jtkrogel Aug 28, 2026
52efac6
removal pass 31
jtkrogel Aug 28, 2026
a41d7c8
removal pass 32
jtkrogel Aug 28, 2026
2cea6d2
removal pass 33
jtkrogel Aug 28, 2026
680a405
removal pass 34
jtkrogel Aug 28, 2026
26d9261
removal pass 35
jtkrogel Aug 28, 2026
7570c77
removal pass 36
jtkrogel Aug 28, 2026
ec6e057
removal pass 37
jtkrogel Aug 28, 2026
3d10c1f
Merge remote-tracking branch 'main/develop' into rem_nonfunc_inputs
jtkrogel Aug 31, 2026
93f0f28
Merge remote-tracking branch 'main/develop' into rem_nonfunc_inputs
jtkrogel Sep 11, 2026
32525a9
Defer Nexus input schema changes
jtkrogel Sep 11, 2026
5a046a2
Keep deferred Nexus changes local
jtkrogel Sep 11, 2026
194b9f4
remove unneeded unit tests
jtkrogel Sep 11, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/Estimators/OneBodyDensityMatricesInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ OneBodyDensityMatricesInput::OneBodyDensityMatricesInput(xmlNodePtr cur)
input_section_.readXML(cur);
auto setIfInInput = LAMBDA_setIfInInput;
setIfInInput(name_, "name");
setIfInInput(energy_matrix_, "energy_matrix");
setIfInInput(use_drift_, "use_drift");
setIfInInput(normalized_, "normalized");
setIfInInput(volume_normalized_, "volume_normalized");
setIfInInput(check_overlap_, "check_overlap");
setIfInInput(check_derivatives_, "check_derivatives");
setIfInInput(volume_normalized_, "volume_normed");
setIfInInput(rstats_, "rstats");
setIfInInput(write_acceptance_ratio_, "acceptance_ratio");
setIfInInput(integrator_, "integrator");
Expand Down
14 changes: 3 additions & 11 deletions src/Estimators/OneBodyDensityMatricesInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,10 @@ class OneBodyDensityMatricesInput
// clang-format off
section_name = "OneBodyDensityMatrices";
attributes = {"name"};
parameters = {"basis", "energy_matrix", "integrator", "evaluator", "scale",
parameters = {"basis", "integrator", "evaluator", "scale",
"corner", "center", "points", "samples", "warmup", "timestep",
"use_drift", "check_overlap", "check_derivatives", "acceptance_ratio", "rstats",
"normalized", "volumed_normed"};
bools = {"energy_matrix", "use_drift", "normalized", "volume_normed",
"check_overlap", "check_derivatives", "rstats", "acceptance_ratio"};
"use_drift", "acceptance_ratio", "rstats", "normalized", "volume_normed"};
bools = {"use_drift", "normalized", "volume_normed", "rstats", "acceptance_ratio"};
enums = {"integrator", "evaluator"};
strings = {"name"};
multi_strings = {"basis"};
Expand Down Expand Up @@ -108,12 +106,9 @@ class OneBodyDensityMatricesInput
OneBodyDensityMatricesInputSection input_section_;

// Default parameters for OneBodyDensityMatrices
bool energy_matrix_ = false;
bool use_drift_ = false;
bool normalized_ = true;
bool volume_normalized_ = true;
bool check_overlap_ = false;
bool check_derivatives_ = false;
bool rstats_ = false;
bool write_acceptance_ratio_ = false;
/// This flag is derived from input so if you construct an OBDMI directly with center it must be set.
Expand All @@ -134,12 +129,9 @@ class OneBodyDensityMatricesInput

public:
const std::string& get_name() const { return name_; }
bool get_energy_matrix() const { return energy_matrix_; }
bool get_use_drift() const { return use_drift_; }
bool get_normalized() const { return normalized_; }
bool get_volume_normalized() const { return volume_normalized_; }
bool get_check_overlap() const { return check_overlap_; }
bool get_check_derivatives() const { return check_derivatives_; }
bool get_rstats() const { return rstats_; }
bool get_write_acceptance_ratio() const { return write_acceptance_ratio_; }
Integrator get_integrator() const { return integrator_; }
Expand Down
1 change: 0 additions & 1 deletion src/Estimators/PairCorrelationInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ PairCorrelationInput::PairCorrelationInput(xmlNodePtr cur)
explicit_set_nbins_ = setIfInInput(nbins_, "num_bin");
explicit_set_rmax_ = setIfInInput(rmax_, "rmax");
explicit_set_delta_ = setIfInInput(delta_, "dr");
setIfInInput(debug_, "debug");
setIfInInput(sources_, "sources");
}

Expand Down
5 changes: 1 addition & 4 deletions src/Estimators/PairCorrelationInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ class PairCorrelationInput
{
section_name = type_tag;
section_name_alternates = {"gofr"};
attributes = {"name", "num_bin", "rmax", "dr", "debug", "sources"};
attributes = {"name", "num_bin", "rmax", "dr", "sources"};
strings = {"name"};
multi_strings = {"sources"};
reals = {"dr", "rmax"};
integers = {"num_bin"};
bools = {"debug"};
}
};

Expand All @@ -54,15 +53,13 @@ class PairCorrelationInput
bool explicit_set_delta_{false};
int nbins_{20};
bool explicit_set_nbins_{false};
bool debug_{false};

public:
std::string get_name() const { return name_; }
const std::vector<std::string>& get_sources() const { return sources_; }
Real get_rmax() const { return rmax_; }
Real get_delta() const { return delta_; }
int get_nbins() const { return nbins_; }
bool get_debug() const { return debug_; }
bool get_explicit_set_rmax() const { return explicit_set_rmax_; }
bool get_explicit_set_delta() const { return explicit_set_delta_; };
bool get_explicit_set_nbins() const { return explicit_set_nbins_; };
Expand Down
4 changes: 2 additions & 2 deletions src/Estimators/PerParticleHamiltonianLoggerInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ class PerParticleHamiltonianLoggerInput
PerParticleHamiltonianLoggerInputSection()
{
section_name = type_tag;
attributes = {"to_stdout", "validate_per_particle_sum", "name"};
bools = {"to_stdout", "validate_per_particle_sum"};
attributes = {"to_stdout", "name"};
bools = {"to_stdout"};
strings = {"name"};
}
PerParticleHamiltonianLoggerInputSection(const PerParticleHamiltonianLoggerInputSection& other) = default;
Expand Down
1 change: 0 additions & 1 deletion src/Estimators/SpinDensityInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ SpinDensityInput::SpinDensityInput(xmlNodePtr cur)

setIfInInput(name_, "name");
setIfInInput(write_report_, "report");
setIfInInput(save_memory_, "save_memory");
have_dr_ = setIfInInput(dr_, "dr");
have_corner_ = setIfInInput(corner_, "corner");
have_center_ = setIfInInput(center_, "center");
Expand Down
6 changes: 2 additions & 4 deletions src/Estimators/SpinDensityInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ class SpinDensityInput
{
// clang-format off
section_name = type_tag;
attributes = {"name", "report", "save_memory"};
attributes = {"name", "report"};
parameters = {"dr", "grid", "corner", "center", "cell"};
strings = {"name"};
bools = {"report", "save_memory"};
bools = {"report"};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

save_memory does do something uses a different memory pattern for moves that for large grids reduces the size of memory needed on the walkers.

positions = {"dr", "grid", "corner", "center"};
multi_reals = {"cell"};
// clang-format on
Expand All @@ -67,7 +67,6 @@ class SpinDensityInput
TinyVector<int, DIM> get_grid() const { return grid_; }
int get_npoints() const { return npoints_; }
bool get_write_report() const { return write_report_; }
bool get_save_memory() const { return save_memory_; }
const std::string& get_name() const { return name_; }

struct DerivedParameters
Expand Down Expand Up @@ -100,7 +99,6 @@ class SpinDensityInput
TinyVector<int, DIM> grid_;
int npoints_{0};
bool write_report_{false};
bool save_memory_{false};
/** these are necessary for calculateDerivedParameters
*
* If we are going to later write out a canonical input for
Expand Down
2 changes: 0 additions & 2 deletions src/Estimators/SpinDensityNew.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ SpinDensityNew::SpinDensityNew(SpinDensityInput&& input, const SpeciesSet& speci
species_size_(getSpeciesSize(species))
{
data_locality_ = DataLocality::crowd;
if (input_.get_save_memory())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removes working functionality, I don't think that's the intention and all the other memory saving code is left behind by this as dead code.

dl = DataLocality::rank;

if (input_.get_cell().explicitly_defined == true)
lattice_ = input_.get_cell();
Expand Down
17 changes: 17 additions & 0 deletions src/Estimators/tests/test_OneBodyDensityMatricesInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "Message/UniformCommunicateError.h"

#include <iostream>
#include <string_view>

namespace qmcplusplus
{
Expand Down Expand Up @@ -56,4 +57,20 @@ TEST_CASE("OneBodyDensityMatricesInput::copy_construction", "[estimators]")
static_assert(std::is_copy_constructible_v<OneBodyDensityMatricesInput>);
}

TEST_CASE("OneBodyDensityMatricesInput::volume_normed", "[estimators]")
{
constexpr std::string_view input_xml = R"XML(
<estimator type="OneBodyDensityMatrices" name="OneBodyDensityMatrices">
<parameter name="basis">spo_ud</parameter>
<parameter name="integrator">uniform</parameter>
<parameter name="volume_normed">no</parameter>
</estimator>
)XML";

Libxml2Document doc;
REQUIRE(doc.parseFromString(input_xml));
OneBodyDensityMatricesInput obdmi(doc.getRoot());
CHECK_FALSE(obdmi.get_volume_normalized());
}

} // namespace qmcplusplus
4 changes: 0 additions & 4 deletions src/Numerics/OneDimGridFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ std::unique_ptr<OneDimGridFactory::GridType> OneDimGridFactory::createGrid(xmlNo
RealType astep = 1.25e-2;
IndexType npts = 1001;
std::string gridType("log");
std::string gridID("invalid");
OhmmsAttributeSet radAttrib;
radAttrib.add(gridType, "type");
radAttrib.add(npts, "npts");
Expand All @@ -37,9 +36,6 @@ std::unique_ptr<OneDimGridFactory::GridType> OneDimGridFactory::createGrid(xmlNo
radAttrib.add(astep, "astep");
radAttrib.add(ascale, "scale");
radAttrib.add(astep, "step");
radAttrib.add(gridID, "id");
radAttrib.add(gridID, "name");
radAttrib.add(gridID, "ref");
if (cur != NULL)
radAttrib.put(cur);
if (gridType == "log")
Expand Down
Loading
Loading