Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@drreynolds
drreynolds committed Oct 30, 2024
1 parent bacd4d8 commit 9147566
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
48 changes: 24 additions & 24 deletions src/arkode/arkode_mristep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0, N_Vector y0,
be allocated later on (based on the MRI method) */

/* Copy the slow RHS functions into stepper memory */
step_mem->fse = fse;
step_mem->fsi = fsi;
step_mem->fse = fse;
step_mem->fsi = fsi;
step_mem->fse_is_current = SUNFALSE;
step_mem->fsi_is_current = SUNFALSE;

Expand Down Expand Up @@ -346,8 +346,8 @@ int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0,
}

/* Copy the input parameters into ARKODE state */
step_mem->fse = fse;
step_mem->fsi = fsi;
step_mem->fse = fse;
step_mem->fsi = fsi;
step_mem->fse_is_current = SUNFALSE;
step_mem->fsi_is_current = SUNFALSE;

Expand Down Expand Up @@ -1425,7 +1425,7 @@ int mriStep_FullRHS(ARKodeMem ark_mem, sunrealtype t, N_Vector y, N_Vector f,
nvec = 1;
mriStep_ApplyForcing(step_mem, t, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fsi[0]);
step_mem->Fsi[0]);
}
}
}
Expand Down Expand Up @@ -1518,7 +1518,7 @@ int mriStep_FullRHS(ARKodeMem ark_mem, sunrealtype t, N_Vector y, N_Vector f,
nvec = 1;
mriStep_ApplyForcing(step_mem, t, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fse[0]);
step_mem->Fse[0]);
}
}

Expand All @@ -1543,7 +1543,7 @@ int mriStep_FullRHS(ARKodeMem ark_mem, sunrealtype t, N_Vector y, N_Vector f,
nvec = 1;
mriStep_ApplyForcing(step_mem, t, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fsi[0]);
step_mem->Fsi[0]);
}
}
}
Expand Down Expand Up @@ -1787,7 +1787,7 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
nvec = 1;
mriStep_ApplyForcing(step_mem, ark_mem->tn, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fse[0]);
step_mem->Fse[0]);
}
}
}
Expand All @@ -1811,7 +1811,7 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
nvec = 1;
mriStep_ApplyForcing(step_mem, ark_mem->tn, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fsi[0]);
step_mem->Fsi[0]);
}
}
}
Expand Down Expand Up @@ -1845,7 +1845,7 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
is the [already-computed] slow RHS from the start of the step */

/* Loop over remaining internal stages */
for (is = 1; is < step_mem->stages-1; is++)
for (is = 1; is < step_mem->stages - 1; is++)
{
/* Set relevant stage times (including desired stage time for implicit solves) */
t0 = ark_mem->tn + step_mem->MRIC->c[is - 1] * ark_mem->h;
Expand Down Expand Up @@ -2018,7 +2018,7 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt

/* Reset ark_mem->tcur as the time value corresponding with the end of the step */
/* Set relevant stage times (including desired stage time for implicit solves) */
t0 = ark_mem->tn + step_mem->MRIC->c[is-2] * ark_mem->h;
t0 = ark_mem->tn + step_mem->MRIC->c[is - 2] * ark_mem->h;
tf = ark_mem->tcur = ark_mem->tn + ark_mem->h;

/* Solver diagnostics reporting */
Expand Down Expand Up @@ -2068,15 +2068,15 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
retval = mriStepInnerStepper_Reset(step_mem->stepper, t0, ark_mem->ycur);
if (retval != ARK_SUCCESS)
{
arkProcessError(ark_mem, ARK_INNERSTEP_FAIL, __LINE__, __func__,
__FILE__, "Unable to reset the inner stepper");
arkProcessError(ark_mem, ARK_INNERSTEP_FAIL, __LINE__, __func__, __FILE__,
"Unable to reset the inner stepper");
return (ARK_INNERSTEP_FAIL);
}
}

/* Compute final stage (for evolved solution), along with error estimate */
{
is = step_mem->stages-1;
is = step_mem->stages - 1;

/* Set relevant stage times (including desired stage time for implicit solves) */
t0 = ark_mem->tn + step_mem->MRIC->c[is - 1] * ark_mem->h;
Expand Down Expand Up @@ -2156,7 +2156,7 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
*dsmPtr = N_VWrmsNorm(ark_mem->tempv1, ark_mem->ewt);
}

} /* loop over stages */
} /* loop over stages */

/* Solver diagnostics reporting */
#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
Expand Down Expand Up @@ -2285,7 +2285,7 @@ int mriStep_TakeStepMRISR(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr)
function here (unlike ERKStep and ARKStep) since it does not need to check
for FSAL or SA methods and thus avoids potentially unnecessary evaluations
of the inner (fast) RHS function */

if (!(ark_mem->fn_is_current))
{
/* compute the explicit component */
Expand All @@ -2305,7 +2305,7 @@ int mriStep_TakeStepMRISR(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr)
nvec = 1;
mriStep_ApplyForcing(step_mem, ark_mem->tn, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fse[0]);
step_mem->Fse[0]);
}
}

Expand All @@ -2326,7 +2326,7 @@ int mriStep_TakeStepMRISR(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr)
nvec = 1;
mriStep_ApplyForcing(step_mem, ark_mem->tn, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fsi[0]);
step_mem->Fsi[0]);
}
}

Expand Down Expand Up @@ -2764,7 +2764,7 @@ int mriStep_TakeStepMERK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr)
step_mem->nfse++;
if (retval) { return ARK_RHSFUNC_FAIL; }
step_mem->fse_is_current = SUNTRUE;
ark_mem->fn_is_current = SUNTRUE;
ark_mem->fn_is_current = SUNTRUE;

/* Add external forcing to Fse[0], if applicable */
if (step_mem->expforcing)
Expand Down Expand Up @@ -4119,7 +4119,7 @@ int mriStep_SlowRHS(ARKodeMem ark_mem, sunrealtype t, N_Vector y, N_Vector f,
nvec = 1;
mriStep_ApplyForcing(step_mem, t, ONE, &nvec);
N_VLinearCombination(nvec, step_mem->cvals, step_mem->Xvecs,
step_mem->Fsi[0]);
step_mem->Fsi[0]);
}
}

Expand Down Expand Up @@ -4771,14 +4771,14 @@ int mriStep_SetInnerForcing(ARKodeMem ark_mem, sunrealtype tshift,
vector is no longer current, since it has a stale forcing function */
if (step_mem->explicit_rhs)
{
step_mem->expforcing = SUNTRUE;
step_mem->impforcing = SUNFALSE;
step_mem->expforcing = SUNTRUE;
step_mem->impforcing = SUNFALSE;
step_mem->fse_is_current = SUNFALSE;
}
else
{
step_mem->expforcing = SUNFALSE;
step_mem->impforcing = SUNTRUE;
step_mem->expforcing = SUNFALSE;
step_mem->impforcing = SUNTRUE;
step_mem->fsi_is_current = SUNFALSE;
}
step_mem->tshift = tshift;
Expand Down
20 changes: 10 additions & 10 deletions src/arkode/arkode_mristep_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ typedef struct ARKodeMRIStepMemRec
sunbooleantype unify_Fs; /* Fse and Fsi point at the same memory */
sunbooleantype fse_is_current;
sunbooleantype fsi_is_current;
MRIStepCoupling MRIC; /* slow->fast coupling table */
int q; /* method order */
int p; /* embedding order */
int stages; /* total number of stages */
int nstages_active; /* number of active stage RHS vectors */
int nstages_allocated; /* number of stage RHS vectors allocated */
int* stage_map; /* index map for storing stage RHS vectors */
int* stagetypes; /* type flags for stages */
sunrealtype* Ae_row; /* equivalent explicit RK coeffs */
sunrealtype* Ai_row; /* equivalent implicit RK coeffs */
MRIStepCoupling MRIC; /* slow->fast coupling table */
int q; /* method order */
int p; /* embedding order */
int stages; /* total number of stages */
int nstages_active; /* number of active stage RHS vectors */
int nstages_allocated; /* number of stage RHS vectors allocated */
int* stage_map; /* index map for storing stage RHS vectors */
int* stagetypes; /* type flags for stages */
sunrealtype* Ae_row; /* equivalent explicit RK coeffs */
sunrealtype* Ai_row; /* equivalent implicit RK coeffs */

/* Algebraic solver data and parameters */
N_Vector sdata; /* old stage data in residual */
Expand Down

0 comments on commit 9147566

Please sign in to comment.