Skip to content

Commit

Permalink
post-merge fix: change RCONST to SUN_RCONST
Browse files Browse the repository at this point in the history
  • Loading branch information
@balos1
balos1 committed Nov 11, 2023
1 parent 07f73cc commit 2f3773b
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 128 deletions.
10 changes: 5 additions & 5 deletions src/arkode/arkode_adapt_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ extern "C" {
#define ARK_ADAPT_LIW 7 /* includes function/data pointers */

/* Time step controller default values */
#define CFLFAC RCONST(0.5)
#define SAFETY RCONST(0.96) /* CVODE uses 1.0 */
#define GROWTH RCONST(20.0) /* CVODE uses 10.0 */
#define HFIXED_LB RCONST(1.0) /* CVODE uses 1.0 */
#define HFIXED_UB RCONST(1.5) /* CVODE uses 1.5 */
#define CFLFAC SUN_RCONST(0.5)
#define SAFETY SUN_RCONST(0.96) /* CVODE uses 1.0 */
#define GROWTH SUN_RCONST(20.0) /* CVODE uses 10.0 */
#define HFIXED_LB SUN_RCONST(1.0) /* CVODE uses 1.0 */
#define HFIXED_UB SUN_RCONST(1.5) /* CVODE uses 1.5 */

#define ETAMX1 SUN_RCONST(10000.0) /* maximum step size change on first step */
#define ETAMXF SUN_RCONST(0.3) /* step size reduction factor on multiple error
Expand Down
2 changes: 1 addition & 1 deletion src/arkode/arkode_arkstep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3054,7 +3054,7 @@ int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, sunrealtype *dsmPtr)
/* solve for y update (stored in y) */
retval = step_mem->msolve((void *) ark_mem, y, step_mem->nlscoef);
if (retval < 0) {
*dsmPtr = RCONST(2.0); /* indicate too much error, step with smaller step */
*dsmPtr = SUN_RCONST(2.0); /* indicate too much error, step with smaller step */
N_VScale(ONE, ark_mem->yn, y); /* place old solution into y */
return(CONV_FAIL);
}
Expand Down
132 changes: 66 additions & 66 deletions src/arkode/arkode_arkstep_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,12 +524,12 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_PI allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.2));
(void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, RCONST(0.8),
-RCONST(0.31));
hadapt_mem->safety = RCONST(0.99);
hadapt_mem->growth = RCONST(25.0);
hadapt_mem->etamxf = RCONST(0.3);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.2));
(void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, SUN_RCONST(0.8),
-SUN_RCONST(0.31));
hadapt_mem->safety = SUN_RCONST(0.99);
hadapt_mem->growth = SUN_RCONST(25.0);
hadapt_mem->etamxf = SUN_RCONST(0.3);
hadapt_mem->pq = PQ;

/* implicit */
Expand All @@ -549,7 +549,7 @@ int ARKStepSetOptimalParams(void *arkode_mem)
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.001);
step_mem->nlscoef = SUN_RCONST(0.001);
step_mem->maxcor = 5;
step_mem->crdown = CRDOWN;
step_mem->rdiv = RDIV;
Expand All @@ -564,17 +564,17 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_I allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.9));
hadapt_mem->safety = RCONST(0.957);
hadapt_mem->growth = RCONST(17.6);
hadapt_mem->etamxf = RCONST(0.45);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.9));
hadapt_mem->safety = SUN_RCONST(0.957);
hadapt_mem->growth = SUN_RCONST(17.6);
hadapt_mem->etamxf = SUN_RCONST(0.45);
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.22);
step_mem->crdown = RCONST(0.17);
step_mem->rdiv = RCONST(2.3);
step_mem->dgmax = RCONST(0.19);
step_mem->nlscoef = SUN_RCONST(0.22);
step_mem->crdown = SUN_RCONST(0.17);
step_mem->rdiv = SUN_RCONST(2.3);
step_mem->dgmax = SUN_RCONST(0.19);
step_mem->msbp = 60;
break;
case 4:
Expand All @@ -585,19 +585,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_PID allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.2));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.535),
-RCONST(0.209), RCONST(0.148));
hadapt_mem->safety = RCONST(0.988);
hadapt_mem->growth = RCONST(31.5);
hadapt_mem->etamxf = RCONST(0.33);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.2));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.535),
-SUN_RCONST(0.209), SUN_RCONST(0.148));
hadapt_mem->safety = SUN_RCONST(0.988);
hadapt_mem->growth = SUN_RCONST(31.5);
hadapt_mem->etamxf = SUN_RCONST(0.33);
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.24);
step_mem->crdown = RCONST(0.26);
step_mem->rdiv = RCONST(2.3);
step_mem->dgmax = RCONST(0.16);
step_mem->nlscoef = SUN_RCONST(0.24);
step_mem->crdown = SUN_RCONST(0.26);
step_mem->rdiv = SUN_RCONST(2.3);
step_mem->dgmax = SUN_RCONST(0.16);
step_mem->msbp = 31;
break;
case 5:
Expand All @@ -608,19 +608,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_PID allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(3.3));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.56),
-RCONST(0.338), RCONST(0.14));
hadapt_mem->safety = RCONST(0.937);
hadapt_mem->growth = RCONST(22.0);
hadapt_mem->etamxf = RCONST(0.44);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(3.3));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.56),
-SUN_RCONST(0.338), SUN_RCONST(0.14));
hadapt_mem->safety = SUN_RCONST(0.937);
hadapt_mem->growth = SUN_RCONST(22.0);
hadapt_mem->etamxf = SUN_RCONST(0.44);
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.25);
step_mem->crdown = RCONST(0.4);
step_mem->rdiv = RCONST(2.3);
step_mem->dgmax = RCONST(0.32);
step_mem->nlscoef = SUN_RCONST(0.25);
step_mem->crdown = SUN_RCONST(0.4);
step_mem->rdiv = SUN_RCONST(2.3);
step_mem->dgmax = SUN_RCONST(0.32);
step_mem->msbp = 31;
break;
}
Expand All @@ -642,7 +642,7 @@ int ARKStepSetOptimalParams(void *arkode_mem)
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.001);
step_mem->nlscoef = SUN_RCONST(0.001);
step_mem->maxcor = 5;
step_mem->crdown = CRDOWN;
step_mem->rdiv = RDIV;
Expand All @@ -657,19 +657,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_PID allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.42));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.54),
-RCONST(0.36), RCONST(0.14));
hadapt_mem->safety = RCONST(0.965);
hadapt_mem->growth = RCONST(28.7);
hadapt_mem->etamxf = RCONST(0.46);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.42));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.54),
-SUN_RCONST(0.36), SUN_RCONST(0.14));
hadapt_mem->safety = SUN_RCONST(0.965);
hadapt_mem->growth = SUN_RCONST(28.7);
hadapt_mem->etamxf = SUN_RCONST(0.46);
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.22);
step_mem->crdown = RCONST(0.17);
step_mem->rdiv = RCONST(2.3);
step_mem->dgmax = RCONST(0.19);
step_mem->nlscoef = SUN_RCONST(0.22);
step_mem->crdown = SUN_RCONST(0.17);
step_mem->rdiv = SUN_RCONST(2.3);
step_mem->dgmax = SUN_RCONST(0.19);
step_mem->msbp = 60;
break;
case 4:
Expand All @@ -680,19 +680,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_PID allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.35));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.543),
-RCONST(0.297), RCONST(0.14));
hadapt_mem->safety = RCONST(0.97);
hadapt_mem->growth = RCONST(25.0);
hadapt_mem->etamxf = RCONST(0.47);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.35));
(void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.543),
-SUN_RCONST(0.297), SUN_RCONST(0.14));
hadapt_mem->safety = SUN_RCONST(0.97);
hadapt_mem->growth = SUN_RCONST(25.0);
hadapt_mem->etamxf = SUN_RCONST(0.47);
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.24);
step_mem->crdown = RCONST(0.26);
step_mem->rdiv = RCONST(2.3);
step_mem->dgmax = RCONST(0.16);
step_mem->nlscoef = SUN_RCONST(0.24);
step_mem->crdown = SUN_RCONST(0.26);
step_mem->rdiv = SUN_RCONST(2.3);
step_mem->dgmax = SUN_RCONST(0.16);
step_mem->msbp = 31;
break;
case 5:
Expand All @@ -703,19 +703,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
"SUNAdaptController_PI allocation failure");
return(ARK_MEM_FAIL);
}
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.15));
(void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, RCONST(0.8),
-RCONST(0.35));
hadapt_mem->safety = RCONST(0.993);
hadapt_mem->growth = RCONST(28.5);
hadapt_mem->etamxf = RCONST(0.3);
(void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.15));
(void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, SUN_RCONST(0.8),
-SUN_RCONST(0.35));
hadapt_mem->safety = SUN_RCONST(0.993);
hadapt_mem->growth = SUN_RCONST(28.5);
hadapt_mem->etamxf = SUN_RCONST(0.3);
hadapt_mem->small_nef = SMALL_NEF;
hadapt_mem->etacf = ETACF;
hadapt_mem->pq = PQ;
step_mem->nlscoef = RCONST(0.25);
step_mem->crdown = RCONST(0.4);
step_mem->rdiv = RCONST(2.3);
step_mem->dgmax = RCONST(0.32);
step_mem->nlscoef = SUN_RCONST(0.25);
step_mem->crdown = SUN_RCONST(0.4);
step_mem->rdiv = SUN_RCONST(2.3);
step_mem->dgmax = SUN_RCONST(0.32);
step_mem->msbp = 31;
break;
}
Expand Down
10 changes: 5 additions & 5 deletions src/arkode/arkode_erkstep_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,12 +325,12 @@ int ERKStepSetDefaults(void* arkode_mem)
step_mem->p = 0; /* embedding order */
step_mem->stages = 0; /* no stages */
step_mem->B = NULL; /* no Butcher table */
ark_mem->hadapt_mem->etamxf = RCONST(0.3); /* max change on error-failed step */
ark_mem->hadapt_mem->safety = RCONST(0.99); /* step adaptivity safety factor */
ark_mem->hadapt_mem->growth = RCONST(25.0); /* step adaptivity growth factor */
(void) SUNAdaptController_SetErrorBias(ark_mem->hadapt_mem->hcontroller, RCONST(1.2));
ark_mem->hadapt_mem->etamxf = SUN_RCONST(0.3); /* max change on error-failed step */
ark_mem->hadapt_mem->safety = SUN_RCONST(0.99); /* step adaptivity safety factor */
ark_mem->hadapt_mem->growth = SUN_RCONST(25.0); /* step adaptivity growth factor */
(void) SUNAdaptController_SetErrorBias(ark_mem->hadapt_mem->hcontroller, SUN_RCONST(1.2));
(void) SUNAdaptController_SetParams_PI(ark_mem->hadapt_mem->hcontroller,
RCONST(0.8), -RCONST(0.31));
SUN_RCONST(0.8), -SUN_RCONST(0.31));
return(ARK_SUCCESS);
}

Expand Down
2 changes: 1 addition & 1 deletion src/arkode/arkode_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ int arkSetConstraints(void *arkode_mem, N_Vector constraints)

/* Check the constraints vector */
temptest = N_VMaxNorm(constraints);
if ((temptest > RCONST(2.5)) || (temptest < HALF)) {
if ((temptest > SUN_RCONST(2.5)) || (temptest < HALF)) {
arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
"arkSetConstraints", MSG_ARK_BAD_CONSTR);
return(ARK_ILL_INPUT);
Expand Down
8 changes: 4 additions & 4 deletions src/arkode/arkode_user_controller.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, sunreal

int SUNAdaptController_Reset_ARKUserControl(SUNAdaptController C)
{
SC_EP(C) = RCONST(1.0);
SC_EPP(C) = RCONST(1.0);
SC_HP(C) = RCONST(0.0);
SC_HPP(C) = RCONST(0.0);
SC_EP(C) = SUN_RCONST(1.0);
SC_EPP(C) = SUN_RCONST(1.0);
SC_HP(C) = SUN_RCONST(0.0);
SC_HPP(C) = SUN_RCONST(0.0);
return SUNADAPTCONTROLLER_SUCCESS;
}

Expand Down
18 changes: 9 additions & 9 deletions src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
* Default parameters
* ------------------ */

#define DEFAULT_K1E RCONST(0.367)
#define DEFAULT_K2E RCONST(0.268)
#define DEFAULT_K1I RCONST(0.95)
#define DEFAULT_K2I RCONST(0.95)
#define DEFAULT_BIAS RCONST(1.5)
#define TINY RCONST(1.0e-10)
#define DEFAULT_K1E SUN_RCONST(0.367)
#define DEFAULT_K2E SUN_RCONST(0.268)
#define DEFAULT_K1I SUN_RCONST(0.95)
#define DEFAULT_K2I SUN_RCONST(0.95)
#define DEFAULT_BIAS SUN_RCONST(1.5)
#define TINY SUN_RCONST(1.0e-10)


/* -----------------------------------------------------------------
Expand Down Expand Up @@ -128,7 +128,7 @@ int SUNAdaptController_EstimateStep_ImExGus(SUNAdaptController C, sunrealtype h,
const int ord = p + 1;

/* set usable time-step adaptivity parameters -- first step */
const sunrealtype k = -RCONST(1.0) / ord;
const sunrealtype k = -SUN_RCONST(1.0) / ord;
const sunrealtype e = SUNMAX(SACIMEXGUS_BIAS(C) * dsm, TINY);

/* set usable time-step adaptivity parameters -- subsequent steps */
Expand Down Expand Up @@ -159,7 +159,7 @@ int SUNAdaptController_EstimateStep_ImExGus(SUNAdaptController C, sunrealtype h,

int SUNAdaptController_Reset_ImExGus(SUNAdaptController C)
{
SACIMEXGUS_EP(C) = RCONST(1.0);
SACIMEXGUS_EP(C) = SUN_RCONST(1.0);
SACIMEXGUS_FIRSTSTEP(C) = SUNTRUE;
return SUNADAPTCONTROLLER_SUCCESS;
}
Expand Down Expand Up @@ -203,7 +203,7 @@ int SUNAdaptController_SetErrorBias_ImExGus(SUNAdaptController C, sunrealtype bi
{
if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
/* set allowed value, otherwise set default */
if (bias <= RCONST(0.0)) {
if (bias <= SUN_RCONST(0.0)) {
SACIMEXGUS_BIAS(C) = DEFAULT_BIAS;
} else {
SACIMEXGUS_BIAS(C) = bias;
Expand Down
Loading

0 comments on commit 2f3773b

Please sign in to comment.