From c4dfd5393ea5002ac667d2768a339e7d60a86c47 Mon Sep 17 00:00:00 2001 From: Ethan Coon Date: Wed, 7 Aug 2024 08:45:33 -0600 Subject: [PATCH 1/2] moves demos pointer for 1.5.1 --- docs/documentation/source/ats_demos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/documentation/source/ats_demos b/docs/documentation/source/ats_demos index 17306fa60..2ef0d582a 160000 --- a/docs/documentation/source/ats_demos +++ b/docs/documentation/source/ats_demos @@ -1 +1 @@ -Subproject commit 17306fa60ed8ee1b60a9c38bda7ba242442fe2ca +Subproject commit 2ef0d582aa5339bb40fd6ef5ca2bccfc77a14026 From 4aa5fb7413ca818e12c7a1455f8bfa33c4ef01e8 Mon Sep 17 00:00:00 2001 From: Daniil Svyatsky Date: Tue, 21 Jan 2025 17:32:46 -0700 Subject: [PATCH 2/2] Added parallel communication in transport Advance() to fix #285 --- src/pks/transport/transport_ats_pk.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pks/transport/transport_ats_pk.cc b/src/pks/transport/transport_ats_pk.cc index b682dc134..24bcda999 100644 --- a/src/pks/transport/transport_ats_pk.cc +++ b/src/pks/transport/transport_ats_pk.cc @@ -838,10 +838,14 @@ 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(flux_key_, Tags::NEXT).ScatterMasterToGhosted("face"); + flux_ = S_->Get(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_; - + + S_->GetEvaluator(saturation_key_, Tags::NEXT).Update(*S_, name_); ws_ = S_->Get(saturation_key_, Tags::NEXT).ViewComponent("cell", false); S_->GetEvaluator(saturation_key_, Tags::CURRENT).Update(*S_, name_); @@ -852,7 +856,7 @@ Transport_ATS::AdvanceStep(double t_old, double t_new, bool reinit) S_->GetEvaluator(molar_density_key_, Tags::CURRENT).Update(*S_, name_); mol_dens_prev_ = S_->Get(molar_density_key_, Tags::CURRENT).ViewComponent("cell", false); - + //if (subcycling_) S_->set_time(tag_subcycle_current_, t_old); // this is locally created and has no evaluator -- should get a primary @@ -1035,6 +1039,7 @@ Transport_ATS::AdvanceStep(double t_old, double t_new, bool reinit) VV_PrintSoluteExtrema(tcc_next, dt_MPC); } + // ETC BEGIN HACKING StableTimeStep();