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.

Sign up for GitHub

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

Patch for resolving parallel issue in 1.5.1 #292

Merged
merged 2 commits into from
Feb 12, 2025
+4 −2
Merged

Patch for resolving parallel issue in 1.5.1 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7484969
Added parallel communication in transport Advance() to fix #285
dasvyat Jan 22, 2025
d9275c1
changes branch CI to build off of the correct amanzi branch -- add th…
ecoon Feb 12, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ats-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: amanzi/amanzi
ref: master
ref: amanzi-1.5
submodules: recursive
- name: Extract the ATS branch name
id: branch
Expand Down
1 change: 1 addition & 0 deletions src/pks/flow/richards_pk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,7 @@ Richards::CalculateDiagnostics(const Tag& tag)
// derive fluxes
Teuchos::RCP<CompositeVector> flux = S_->GetPtrW<CompositeVector>(flux_key_, tag_next_, name_);
matrix_diff_->UpdateFlux(pres.ptr(), flux.ptr());
flux->ScatterMasterToGhosted("face");
UpdateVelocity_(tag);
};

Expand Down
3 changes: 2 additions & 1 deletion src/pks/transport/transport_ats_pk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,9 @@ Transport_ATS::AdvanceStep(double t_old, double t_new, bool reinit)
S_->GetEvaluator(flux_key_, Tags::NEXT).Update(*S_, name_);

// why are we re-assigning all of these? The previous pointers shouldn't have changed... --ETC
S_->Get<CompositeVector>(flux_key_, Tags::NEXT).ScatterMasterToGhosted("face");
flux_ = S_->Get<CompositeVector>(flux_key_, Tags::NEXT).ViewComponent("face", true);

// why are we copying this? This should result in constant flux, no need to copy? --ETC
*flux_copy_ = *flux_; // copy flux vector from S_next_ to S_;

Expand Down Expand Up @@ -1037,7 +1039,6 @@ Transport_ATS::AdvanceStep(double t_old, double t_new, bool reinit)

// ETC BEGIN HACKING
StableTimeStep();

ChangedSolutionPK(tag_next_);
return failed;
}
Expand Down