Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintain sanity (or madness) #165

Merged
merged 28 commits into from
May 4, 2023
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e82a155
First attempt
brryan Mar 30, 2023
90645c0
Merge branch 'main' of github.com:lanl/phoebus into brryan/maintain_s…
brryan Apr 18, 2023
32f4655
First attempt
brryan Apr 18, 2023
884a4da
sing?
brryan Apr 18, 2023
1910658
This is better maybe it even works
brryan Apr 18, 2023
35ce897
Fix bug in A
brryan Apr 19, 2023
9a5e2f4
start time for phi adjustment
brryan Apr 19, 2023
96bce20
phi not Phi
brryan Apr 19, 2023
e495489
Formatting
brryan Apr 19, 2023
2186e97
Update torus input file
brryan Apr 19, 2023
abfff6a
Cleanup
brryan Apr 19, 2023
6602af1
Hopefully fix CI
brryan Apr 20, 2023
047a8ae
Have gold_comparison in regression_test provide more (any) informatio…
brryan Apr 27, 2023
54529db
Test of git with vscode
brryan Apr 27, 2023
da90bf9
Merge branch 'brryan/maintain_sanity' of github.com:lanl/phoebus into…
brryan Apr 27, 2023
5f95e36
Working on net field tasking
brryan Apr 27, 2023
29d7281
First pass seems to work with new machinery
brryan Apr 28, 2023
fce5dc1
Better dphi_dt damper
brryan Apr 28, 2023
fd227af
history geom bugfix
brryan Apr 28, 2023
a37c8fa
working pre-formatting
brryan Apr 28, 2023
02c0f1c
Merge branch 'main' of github.com:lanl/phoebus into brryan/maintain_s…
brryan May 2, 2023
36dd811
Properly deal with phoedf geom issue
brryan May 2, 2023
9f7883b
Back to main versions of submodules
brryan May 2, 2023
dec72de
More general ghost cell removal
brryan May 2, 2023
4c490e1
Remove unused variable
brryan May 2, 2023
780b9ea
Remove unnecessary check
brryan May 3, 2023
09ed3a5
No default value for enforced phi
brryan May 3, 2023
c3bfe65
Only set other phi enforcement values if active
brryan May 3, 2023
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
Prev Previous commit
Only set other phi enforcement values if active
  • Loading branch information
brryan committed May 3, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit c3bfe65c79480d7e09f270e5f04717ce766f3227
33 changes: 17 additions & 16 deletions src/fixup/fixup.cpp
Original file line number Diff line number Diff line change
@@ -76,26 +76,27 @@ std::shared_ptr<StateDescriptor> Initialize(ParameterInput *pin) {
bool enable_phi_enforcement =
pin->GetOrAddBoolean("fixup", "enable_phi_enforcement", false);
params.Add("enable_phi_enforcement", enable_phi_enforcement);
Real enforced_phi = pin->GetReal("fixup", "enforced_phi");
params.Add("enforced_phi", enforced_phi);
Real enforced_phi_timescale =
pin->GetOrAddReal("fixup", "enforced_phi_timescale", 1.e3);
params.Add("enforced_phi_timescale", enforced_phi_timescale);
Real enforced_phi_cadence = pin->GetOrAddReal("fixup", "enforced_phi_cadence", 10.);
params.Add("enforced_phi_cadence", enforced_phi_cadence);
Real enforced_phi_start_time =
pin->GetOrAddReal("fixup", "enforced_phi_start_time", 175.);
PARTHENON_REQUIRE(enforced_phi_start_time >= 0.,
"Phi enforcement start time must be non-negative!");
params.Add("enforced_phi_start_time", enforced_phi_start_time);
if (enable_phi_enforcement) {
PARTHENON_REQUIRE(typeid(PHOEBUS_GEOMETRY) == typeid(Geometry::FMKS),
"Phi enforcement only supported for BH geometry!");
Real enforced_phi = pin->GetReal("fixup", "enforced_phi");
params.Add("enforced_phi", enforced_phi);
Real enforced_phi_timescale =
pin->GetOrAddReal("fixup", "enforced_phi_timescale", 1.e3);
params.Add("enforced_phi_timescale", enforced_phi_timescale);
Real enforced_phi_cadence = pin->GetOrAddReal("fixup", "enforced_phi_cadence", 10.);
params.Add("enforced_phi_cadence", enforced_phi_cadence);
Real enforced_phi_start_time =
pin->GetOrAddReal("fixup", "enforced_phi_start_time", 175.);
PARTHENON_REQUIRE(enforced_phi_start_time >= 0.,
"Phi enforcement start time must be non-negative!");
params.Add("enforced_phi_start_time", enforced_phi_start_time);

// Mutable parameters for following sanity maintenance
params.Add("dphi_dt", 0., true);
params.Add("next_dphi_dt_update_time", enforced_phi_start_time, true);
params.Add("phi_factor", 0., true);
}
// Mutable parameters for following sanity maintenance
params.Add("dphi_dt", 0., true);
params.Add("next_dphi_dt_update_time", enforced_phi_start_time, true);
params.Add("phi_factor", 0., true);

if (enable_mhd_floors && !enable_mhd) {
enable_mhd_floors = false;