Skip to content
Merged
Changes from 2 commits
Commits
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
22 changes: 8 additions & 14 deletions two-scale-heat-conduction/macro-dumux/appl/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,7 @@ int main(int argc, char **argv)
problem->applyInitialSolution(x);
auto xOld = x;

auto xCheckpoint = x;
double timeCheckpoint = 0.0;
int timeStepCheckpoint = 0;
int timeStepCheckpoint = 0;

// initialize the coupling data
std::vector<double> temperatures;
Expand Down Expand Up @@ -226,8 +224,11 @@ int main(int argc, char **argv)
// output every vtkOutputInterval time step
const int vtkOutputInterval = getParam<int>("TimeLoop.OutputInterval");

// initialize preCICE
couplingParticipant.initialize();
// initialize preCICE and the adapter checkpointing
if (runWithCoupling) {
couplingParticipant.initialize();
couplingParticipant.initializeCheckpoint(x, *gridVariables);
}

// time loop parameters
const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
Expand Down Expand Up @@ -272,9 +273,7 @@ int main(int argc, char **argv)
break;

// write checkpoint
if (couplingParticipant.requiresToWriteCheckpoint()) {
xCheckpoint = x;
timeCheckpoint = timeLoop->time();
if (couplingParticipant.writeCheckpointIfRequired()) {
timeStepCheckpoint = timeLoop->timeStepIndex();
}

Expand Down Expand Up @@ -357,14 +356,9 @@ int main(int argc, char **argv)
couplingParticipant.advance(dt);

// reset to checkpoint if not converged
if (couplingParticipant.requiresToReadCheckpoint()) {
x = xCheckpoint;
xOld = x;
timeLoop->setTime(timeCheckpoint, timeStepCheckpoint);

if (couplingParticipant.readCheckpointIfRequired()) {
// TODO: previousTimeStep might be more appropriate, last one could be small
timeLoop->setTimeStepSize(dt);
gridVariables->update(x);
gridVariables->advanceTimeStep();
continue;
}
Expand Down