Skip to content

Fixed subcycling in implicit coupling (for regular simulations) #106

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

Closed
boris-martin wants to merge 13 commits into from
Closed

Fixed subcycling in implicit coupling (for regular simulations) #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c557304
first draft of working subcycling in nonlingeo
boris-martin Sep 25, 2022
f1aca07
nonbreaking (I think) refactor
boris-martin Sep 25, 2022
2f7d217
removed dead code
boris-martin Sep 25, 2022
8ef7baf
removed useless copies
boris-martin Sep 25, 2022
9da4a56
removed more unneeded code
boris-martin Sep 25, 2022
d490199
added needed free statements
boris-martin Sep 25, 2022
032eeb4
removed reference to output buffer
boris-martin Sep 26, 2022
533d338
cleanup
boris-martin Sep 26, 2022
fb68d81
removed extra buffer code
boris-martin Sep 26, 2022
87f5cb8
removed redundant variables
boris-martin Sep 26, 2022
f827afe
typo
boris-martin Sep 26, 2022
5126dc0
Run clang
KyleDavisSA Nov 15, 2022
7ac7c0a
Merge branch 'develop' into nonlingeo_implicit_refactor
IshaanDesai Nov 16, 2022
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
18 changes: 16 additions & 2 deletions adapter/PreciceInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ void Precice_Setup(char *configFilename, char *participantName, SimulationData *

// Initialize variables needed for the coupling
NNEW(sim->coupling_init_v, double, sim->mt * sim->nk);
NNEW(sim->coupling_init_ve, double, sim->mt * sim->nk);
NNEW(sim->coupling_init_acc, double, sim->mt * sim->nk);

// Initialize preCICE
sim->precice_dt = precicec_initialize();
Expand Down Expand Up @@ -128,7 +130,7 @@ void Precice_FulfilledWriteCheckpoint()
precicec_markActionFulfilled("write-iteration-checkpoint");
}

void Precice_ReadIterationCheckpoint(SimulationData *sim, double *v)
void Precice_ReadIterationCheckpoint(SimulationData *sim, double *v, double *ve, double *acc)
{

printf("Adapter reading checkpoint...\n");
Expand All @@ -142,9 +144,11 @@ void Precice_ReadIterationCheckpoint(SimulationData *sim, double *v)

// Reload solution vector v
memcpy(v, sim->coupling_init_v, sizeof(double) * sim->mt * sim->nk);
memcpy(ve, sim->coupling_init_ve, sizeof(double) * sim->mt * sim->nk);
memcpy(acc, sim->coupling_init_acc, sizeof(double) * sim->mt * sim->nk);
}

void Precice_WriteIterationCheckpoint(SimulationData *sim, double *v)
void Precice_WriteIterationCheckpoint(SimulationData *sim, double *v, double *ve, double *acc)
{

printf("Adapter writing checkpoint...\n");
Expand All @@ -158,6 +162,8 @@ void Precice_WriteIterationCheckpoint(SimulationData *sim, double *v)

// Save solution vector v
memcpy(sim->coupling_init_v, v, sizeof(double) * sim->mt * sim->nk);
memcpy(sim->coupling_init_ve, ve, sizeof(double) * sim->mt * sim->nk);
memcpy(sim->coupling_init_acc, acc, sizeof(double) * sim->mt * sim->nk);
}

void Precice_ReadIterationCheckpointModal(SimulationData *sim, double *dofs, double *derivatives, int nev)
Expand Down Expand Up @@ -437,6 +443,14 @@ void Precice_FreeData(SimulationData *sim)
free(sim->coupling_init_v);
}

if (sim->coupling_init_ve != NULL) {
free(sim->coupling_init_ve);
}

if (sim->coupling_init_acc != NULL) {
free(sim->coupling_init_acc);
}

for (i = 0; i < sim->numPreciceInterfaces; i++) {
PreciceInterface_FreeData(sim->preciceInterfaces[i]);
free(sim->preciceInterfaces[i]);
Expand Down
10 changes: 8 additions & 2 deletions adapter/PreciceInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ typedef struct SimulationData {

// Coupling data
double *coupling_init_v;
double *coupling_init_ve;
double *coupling_init_acc;
double coupling_init_theta;
double coupling_init_dtheta;
double precice_dt;
Expand Down Expand Up @@ -213,15 +215,19 @@ void Precice_FulfilledWriteCheckpoint();
* @brief Reads iteration checkpoint
* @param sim: Structure with CalculiX data
* @param v: CalculiX array with the temperature and displacement values
* @param ve: CalculiX array with the temperature and displacement derivatives
* @param acc: CalculiX array with the temperature and displacement acceleration
*/
void Precice_ReadIterationCheckpoint(SimulationData *sim, double *v);
void Precice_ReadIterationCheckpoint(SimulationData *sim, double *v, double *ve, double *acc);

/**
* @brief Writes iteration checkpoint
* @param sim: Structure with CalculiX data
* @param v: CalculiX array with the temperature and displacement values
* @param ve: CalculiX array with the temperature and displacement derivatives
* @param acc: CalculiX array with the temperature and displacement acceleration
*/
void Precice_WriteIterationCheckpoint(SimulationData *sim, double *v);
void Precice_WriteIterationCheckpoint(SimulationData *sim, double *v, double *ve, double *acc);

/**
* @brief Reads iteration checkpoint (in dyna_precice)
Expand Down
29 changes: 21 additions & 8 deletions nonlingeo_precice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,8 @@ void nonlingeo_precice(double **cop, ITG *nk, ITG **konp, ITG **ipkonp, char **l
/* Adapter: Create the interfaces and initialize the coupling */
Precice_Setup(configFilename, preciceParticipantName, &simulationData);

ITG kode_backup;

while (Precice_IsCouplingOngoing()) {

/* Adapter: Adjust solver time step */
Expand All @@ -1646,9 +1648,6 @@ void nonlingeo_precice(double **cop, ITG *nk, ITG **konp, ITG **ipkonp, char **l

/* previous increment converged: update the initial values */

iinc++;
jprint++;

/* store number of elements (important for implicit dynamic
contact */

Expand All @@ -1659,13 +1658,22 @@ void nonlingeo_precice(double **cop, ITG *nk, ITG **konp, ITG **ipkonp, char **l
isiz = mt * *nk;
cpypardou(vini, vold, &isiz, &num_cpus);

isiz = *nboun;
cpypardou(xbounini, xbounact, &isiz, &num_cpus);

if (Precice_IsWriteCheckpointRequired()) {
Precice_WriteIterationCheckpoint(&simulationData, vini);
Precice_WriteIterationCheckpoint(&simulationData, vini, veini, accini);

iinc++;
jprint++;

kode_backup = *kode;
simulationData.stored_iinc = iinc;
simulationData.stored_jprint = jprint;

Precice_FulfilledWriteCheckpoint();
}

isiz = *nboun;
cpypardou(xbounini, xbounact, &isiz, &num_cpus);
if ((*ithermal == 1) || (*ithermal >= 3)) {
isiz = *nk;
cpypardou(t1ini, t1act, &isiz, &num_cpus);
Expand Down Expand Up @@ -3706,8 +3714,13 @@ void nonlingeo_precice(double **cop, ITG *nk, ITG **konp, ITG **ipkonp, char **l
/* Adapter: If the coupling does not converge, read the checkpoint */
if (Precice_IsReadCheckpointRequired()) {
if (*nmethod == 4) {
Precice_ReadIterationCheckpoint(&simulationData, vold);
Precice_ReadIterationCheckpoint(&simulationData, vini, veini, accini);
iinc = simulationData.stored_iinc;
jprint = simulationData.stored_jprint;

icutb++;

*kode = kode_backup;
}
Precice_FulfilledReadCheckpoint();
}
Expand Down Expand Up @@ -3905,7 +3918,7 @@ void nonlingeo_precice(double **cop, ITG *nk, ITG **konp, ITG **ipkonp, char **l

/* output */

if ((jout[0] == jprint) && (icutb == 0)) {
if ((jout[0] == jprint) && (icutb == 0) && precicec_isTimeWindowComplete()) {

jprint = 0;

Expand Down