Skip to content

Commit

Permalink
fn to tempv3
Browse files Browse the repository at this point in the history
  • Loading branch information
@maggul
maggul committed Nov 15, 2024
1 parent 73ec224 commit f783984
Showing 1 changed file with 40 additions and 43 deletions.
83 changes: 40 additions & 43 deletions src/arkode/arkode_lsrkstep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1303,24 +1303,23 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr

retval =
step_mem->fe(ark_mem->tcur + ((sunrealtype)j - ONE) * rat * ark_mem->h,
ark_mem->ycur, ark_mem->fn, ark_mem->user_data);
ark_mem->ycur, ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
ark_mem->fn_is_current = SUNFALSE;

#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS",
"F_%i(:) =", j);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, ark_mem->tempv3,
ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand All @@ -1347,7 +1346,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr

retval =
step_mem->fe(ark_mem->tcur + ((sunrealtype)j - ONE) * rat * ark_mem->h,
ark_mem->ycur, ark_mem->fn, ark_mem->user_data);
ark_mem->ycur, ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
Expand All @@ -1356,14 +1355,14 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS",
"F_%i(:) =", j);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, ark_mem->tempv3,
ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand All @@ -1387,7 +1386,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr

retval = step_mem->fe(ark_mem->tcur +
rat * (rn * (rn + ONE) / TWO - ONE) * ark_mem->h,
ark_mem->ycur, ark_mem->fn, ark_mem->user_data);
ark_mem->ycur, ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
Expand All @@ -1396,20 +1395,20 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS",
"F_%i(:) =", (in * (in + 1) / 2));
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

cvals[0] = (rn - ONE) / (TWO * rn - ONE);
Xvecs[0] = ark_mem->ycur;
cvals[1] = rn / (TWO * rn - ONE);
Xvecs[1] = ark_mem->tempv2;
cvals[2] = (rn - ONE) * rat * ark_mem->h / (TWO * rn - ONE);
Xvecs[2] = ark_mem->fn;
Xvecs[2] = ark_mem->tempv3;

retval = N_VLinearCombination(3, cvals, Xvecs, ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand All @@ -1436,7 +1435,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr

retval = step_mem->fe(ark_mem->tcur +
((sunrealtype)j - rn - ONE) * rat * ark_mem->h,
ark_mem->ycur, ark_mem->fn, ark_mem->user_data);
ark_mem->ycur, ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
Expand All @@ -1445,14 +1444,14 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS",
"F_%i(:) =", j);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, ark_mem->tempv3,
ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand Down Expand Up @@ -1584,23 +1583,22 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
#endif

retval = step_mem->fe(ark_mem->tcur + ark_mem->h * p5, ark_mem->ycur,
ark_mem->fn, ark_mem->user_data);
ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
ark_mem->fn_is_current = SUNFALSE;

#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSP43", "stage RHS",
"F_%i(:) =", 2);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * p5, ark_mem->fn, ark_mem->ycur);
N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * p5, ark_mem->tempv3, ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand All @@ -1619,7 +1617,7 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
ark_mem->nst, 3, ark_mem->h, ark_mem->tcur + ark_mem->h);
#endif

retval = step_mem->fe(ark_mem->tcur + ark_mem->h, ark_mem->ycur, ark_mem->fn,
retval = step_mem->fe(ark_mem->tcur + ark_mem->h, ark_mem->ycur, ark_mem->tempv3,
ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
Expand All @@ -1629,20 +1627,20 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSP43", "stage RHS",
"F_%i(:) =", 3);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

cvals[0] = ONE / THREE;
Xvecs[0] = ark_mem->ycur;
cvals[1] = TWO / THREE;
Xvecs[1] = ark_mem->yn;
cvals[2] = ONE / SIX * ark_mem->h;
Xvecs[2] = ark_mem->fn;
Xvecs[2] = ark_mem->tempv3;

retval = N_VLinearCombination(3, cvals, Xvecs, ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand All @@ -1663,7 +1661,7 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
#endif

retval = step_mem->fe(ark_mem->tcur + ark_mem->h * p5, ark_mem->ycur,
ark_mem->fn, ark_mem->user_data);
ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
Expand All @@ -1672,13 +1670,13 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSP43", "stage RHS",
"F_%i(:) =", 4);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * p5, ark_mem->fn, ark_mem->ycur);
N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * p5, ark_mem->tempv3, ark_mem->ycur);
if (!ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, ark_mem->h / rs, ark_mem->tempv3,
ark_mem->tempv1);
}

Expand Down Expand Up @@ -1806,25 +1804,24 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt

retval = step_mem->fe(ark_mem->tcur +
((sunrealtype)j - ONE) * onesixth * ark_mem->h,
ark_mem->ycur, ark_mem->fn, ark_mem->user_data);
ark_mem->ycur, ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
ark_mem->fn_is_current = SUNFALSE;

#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSP104", "stage RHS",
"F_%i(:) =", j);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, onesixth * ark_mem->h, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->ycur, onesixth * ark_mem->h, ark_mem->tempv3,
ark_mem->ycur);
if (j == 4 && !ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, SUN_RCONST(0.3) * ark_mem->h,
ark_mem->fn, ark_mem->tempv1);
ark_mem->tempv3, ark_mem->tempv1);
}
}
N_VLinearSum(SUN_RCONST(1.0) / SUN_RCONST(25.0), ark_mem->tempv2,
Expand Down Expand Up @@ -1854,7 +1851,7 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt

retval = step_mem->fe(ark_mem->tcur +
((sunrealtype)j - FOUR) * onesixth * ark_mem->h,
ark_mem->ycur, ark_mem->fn, ark_mem->user_data);
ark_mem->ycur, ark_mem->tempv3, ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
if (retval > 0) { return RHSFUNC_RECVR; }
Expand All @@ -1863,21 +1860,21 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSP104", "stage RHS",
"F_%i(:) =", j);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

N_VLinearSum(ONE, ark_mem->ycur, onesixth * ark_mem->h, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->ycur, onesixth * ark_mem->h, ark_mem->tempv3,
ark_mem->ycur);

if (j == 7 && !ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, onefifth * ark_mem->h, ark_mem->fn,
N_VLinearSum(ONE, ark_mem->tempv1, onefifth * ark_mem->h, ark_mem->tempv3,
ark_mem->tempv1);
}
if (j == 9 && !ark_mem->fixedstep)
{
N_VLinearSum(ONE, ark_mem->tempv1, SUN_RCONST(0.3) * ark_mem->h,
ark_mem->fn, ark_mem->tempv1);
ark_mem->tempv3, ark_mem->tempv1);
}

/* apply user-supplied stage postprocessing function (if supplied) */
Expand All @@ -1897,7 +1894,7 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
ark_mem->nst, 10, ark_mem->h, ark_mem->tcur + ark_mem->h);
#endif

retval = step_mem->fe(ark_mem->tcur + ark_mem->h, ark_mem->ycur, ark_mem->fn,
retval = step_mem->fe(ark_mem->tcur + ark_mem->h, ark_mem->ycur, ark_mem->tempv3,
ark_mem->user_data);
step_mem->nfe++;
if (retval < 0) { return ARK_RHSFUNC_FAIL; }
Expand All @@ -1907,15 +1904,15 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
"ARKODE::lsrkStep_TakeStepSSP104", "stage RHS",
"F_%i(:) =", 10);
N_VPrintFile(ark_mem->fn, ARK_LOGGER->debug_fp);
N_VPrintFile(ark_mem->tempv3, ARK_LOGGER->debug_fp);
#endif

cvals[0] = SUN_RCONST(0.6);
Xvecs[0] = ark_mem->ycur;
cvals[1] = ONE;
Xvecs[1] = ark_mem->tempv2;
cvals[2] = SUN_RCONST(0.1) * ark_mem->h;
Xvecs[2] = ark_mem->fn;
Xvecs[2] = ark_mem->tempv3;

retval = N_VLinearCombination(3, cvals, Xvecs, ark_mem->ycur);

Expand Down

0 comments on commit f783984

Please sign in to comment.