Skip to content

Commit e8c6667

Browse files
ZocoLiniZocoLini
committed
booleantype mod
1 parent 45d572a commit e8c6667

File tree

37 files changed

+335
-337
lines changed

37 files changed

+335
-337
lines changed

‎modules/sacess/benchmarks/systemsBiology/BioPredyn/B6/fly/solvers.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4069,8 +4069,8 @@ int my_f(sunrealtype t, N_Vector y, N_Vector ydot, void *extra_data) { //to call
40694069
return 0;
40704070
}
40714071
4072-
int Precond(sunrealtype tn, N_Vector c, N_Vector fc, booleantype jok,
4073-
booleantype *jcurPtr, sunrealtype gamma, void *extra_data, N_Vector vtemp1,
4072+
int Precond(sunrealtype tn, N_Vector c, N_Vector fc, sunbooleantype jok,
4073+
sunbooleantype *jcurPtr, sunrealtype gamma, void *extra_data, N_Vector vtemp1,
40744074
N_Vector vtemp2, N_Vector vtemp3) { //needed by the old Krylov solver
40754075
40764076
const int NRNUC = GetNNucs(&(inp->zyg.defs), inp->zyg.nnucs, tn, &(inp->zyg.times));

‎modules/sacess/benchmarks/systemsBiology/BioPredyn/B6/lib32/sundials-2.5.0/include/cvode/cvode.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ SUNDIALS_EXPORT int CVodeSetUserData(void *cvode_mem, void *user_data);
368368
SUNDIALS_EXPORT int CVodeSetMaxOrd(void *cvode_mem, int maxord);
369369
SUNDIALS_EXPORT int CVodeSetMaxNumSteps(void *cvode_mem, long int mxsteps);
370370
SUNDIALS_EXPORT int CVodeSetMaxHnilWarns(void *cvode_mem, int mxhnil);
371-
SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, booleantype stldet);
371+
SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, sunbooleantype stldet);
372372
SUNDIALS_EXPORT int CVodeSetInitStep(void *cvode_mem, sunrealtype hin);
373373
SUNDIALS_EXPORT int CVodeSetMinStep(void *cvode_mem, sunrealtype hmin);
374374
SUNDIALS_EXPORT int CVodeSetMaxStep(void *cvode_mem, sunrealtype hmax);

‎modules/sacess/benchmarks/systemsBiology/BioPredyn/B6/lib32/sundials-2.5.0/include/cvode/cvode_impl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ typedef struct CVodeMemRec {
7171
sunrealtype cv_reltol; /* relative tolerance */
7272
sunrealtype cv_Sabstol; /* scalar absolute tolerance */
7373
N_Vector cv_Vabstol; /* vector absolute tolerance */
74-
booleantype cv_user_efun; /* TRUE if user sets efun */
74+
sunbooleantype cv_user_efun; /* TRUE if user sets efun */
7575
CVEwtFn cv_efun; /* function to set ewt */
7676
void *cv_e_data; /* user pointer passed to efun */
7777

@@ -102,7 +102,7 @@ typedef struct CVodeMemRec {
102102
Tstop information
103103
-----------------*/
104104

105-
booleantype cv_tstopset;
105+
sunbooleantype cv_tstopset;
106106
sunrealtype cv_tstop;
107107

108108
/*---------
@@ -194,7 +194,7 @@ typedef struct CVodeMemRec {
194194
int (*cv_linit)(struct CVodeMemRec *cv_mem);
195195

196196
int (*cv_lsetup)(struct CVodeMemRec *cv_mem, int convfail, N_Vector ypred,
197-
N_Vector fpred, booleantype *jcurPtr, N_Vector vtemp1,
197+
N_Vector fpred, sunbooleantype *jcurPtr, N_Vector vtemp1,
198198
N_Vector vtemp2, N_Vector vtemp3);
199199

200200
int (*cv_lsolve)(struct CVodeMemRec *cv_mem, N_Vector b, N_Vector weight,
@@ -215,14 +215,14 @@ typedef struct CVodeMemRec {
215215
sunrealtype cv_h0u; /* actual initial stepsize */
216216
sunrealtype cv_hu; /* last successful h value used */
217217
sunrealtype cv_saved_tq5; /* saved value of tq[5] */
218-
booleantype cv_jcur; /* is Jacobian info. for lin. solver current? */
218+
sunbooleantype cv_jcur; /* is Jacobian info. for lin. solver current? */
219219
sunrealtype cv_tolsf; /* tolerance scale factor */
220220
int cv_qmax_alloc; /* value of qmax used when allocating memory */
221221
int cv_indx_acor; /* index of the zn vector with saved acor */
222-
booleantype cv_setupNonNull; /* does setup do anything? */
222+
sunbooleantype cv_setupNonNull; /* does setup do anything? */
223223

224-
booleantype cv_VabstolMallocDone;
225-
booleantype cv_MallocDone;
224+
sunbooleantype cv_VabstolMallocDone;
225+
sunbooleantype cv_MallocDone;
226226

227227
/*-------------------------------------------
228228
Error handler function and error output file
@@ -236,7 +236,7 @@ typedef struct CVodeMemRec {
236236
Stability Limit Detection
237237
-------------------------*/
238238

239-
booleantype cv_sldeton; /* is Stability Limit Detection on? */
239+
sunbooleantype cv_sldeton; /* is Stability Limit Detection on? */
240240
sunrealtype cv_ssdat[6][4]; /* scaled data array for STALD */
241241
int cv_nscon; /* counter for STALD method */
242242
long int cv_nor; /* counter for number of order reductions */
@@ -260,7 +260,7 @@ typedef struct CVodeMemRec {
260260
int cv_taskc; /* copy of parameter itask */
261261
int cv_irfnd; /* flag showing whether last step had a root */
262262
long int cv_nge; /* counter for g evaluations */
263-
booleantype *cv_gactive; /* array with active/inactive event functions */
263+
sunbooleantype *cv_gactive; /* array with active/inactive event functions */
264264
int cv_mxgnull; /* number of warning messages about possible g==0 */
265265

266266

@@ -325,7 +325,7 @@ typedef struct CVodeMemRec {
325325
/*
326326
* -----------------------------------------------------------------
327327
* int (*cv_lsetup)(CVodeMem cv_mem, int convfail, N_Vector ypred,
328-
* N_Vector fpred, booleantype *jcurPtr,
328+
* N_Vector fpred, sunbooleantype *jcurPtr,
329329
* N_Vector vtemp1, N_Vector vtemp2,
330330
* N_Vector vtemp3);
331331
* -----------------------------------------------------------------

‎modules/sacess/benchmarks/systemsBiology/BioPredyn/B6/lib32/sundials-2.5.0/include/cvode/cvode_spils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ extern "C" {
155155
*/
156156

157157
typedef int (*CVSpilsPrecSetupFn)(sunrealtype t, N_Vector y, N_Vector fy,
158-
booleantype jok, booleantype *jcurPtr,
158+
sunbooleantype jok, sunbooleantype *jcurPtr,
159159
sunrealtype gamma, void *user_data,
160160
N_Vector tmp1, N_Vector tmp2,
161161
N_Vector tmp3);

‎modules/sacess/benchmarks/systemsBiology/BioPredyn/B6/lib32/sundials-2.5.0/include/cvodes/cvodes.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ SUNDIALS_EXPORT int CVodeSetUserData(void *cvode_mem, void *user_data);
10191019
SUNDIALS_EXPORT int CVodeSetMaxOrd(void *cvode_mem, int maxord);
10201020
SUNDIALS_EXPORT int CVodeSetMaxNumSteps(void *cvode_mem, long int mxsteps);
10211021
SUNDIALS_EXPORT int CVodeSetMaxHnilWarns(void *cvode_mem, int mxhnil);
1022-
SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, booleantype stldet);
1022+
SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, sunbooleantype stldet);
10231023
SUNDIALS_EXPORT int CVodeSetInitStep(void *cvode_mem, sunrealtype hin);
10241024
SUNDIALS_EXPORT int CVodeSetMinStep(void *cvode_mem, sunrealtype hmin);
10251025
SUNDIALS_EXPORT int CVodeSetMaxStep(void *cvode_mem, sunrealtype hmax);
@@ -1058,7 +1058,7 @@ SUNDIALS_EXPORT int CVodeSetNoInactiveRootWarn(void *cvode_mem);
10581058
* -----------------------------------------------------------------
10591059
*/
10601060

1061-
SUNDIALS_EXPORT int CVodeSetQuadErrCon(void *cvode_mem, booleantype errconQ);
1061+
SUNDIALS_EXPORT int CVodeSetQuadErrCon(void *cvode_mem, sunbooleantype errconQ);
10621062

10631063
/*
10641064
* -----------------------------------------------------------------
@@ -1104,7 +1104,7 @@ SUNDIALS_EXPORT int CVodeSetQuadErrCon(void *cvode_mem, booleantype errconQ);
11041104
*/
11051105

11061106
SUNDIALS_EXPORT int CVodeSetSensDQMethod(void *cvode_mem, int DQtype, sunrealtype DQrhomax);
1107-
SUNDIALS_EXPORT int CVodeSetSensErrCon(void *cvode_mem, booleantype errconS);
1107+
SUNDIALS_EXPORT int CVodeSetSensErrCon(void *cvode_mem, sunbooleantype errconS);
11081108
SUNDIALS_EXPORT int CVodeSetSensMaxNonlinIters(void *cvode_mem, int maxcorS);
11091109
SUNDIALS_EXPORT int CVodeSetSensParams(void *cvode_mem, sunrealtype *p, sunrealtype *pbar, int *plist);
11101110

@@ -1131,7 +1131,7 @@ SUNDIALS_EXPORT int CVodeSetSensParams(void *cvode_mem, sunrealtype *p, sunrealt
11311131
* -----------------------------------------------------------------
11321132
*/
11331133

1134-
SUNDIALS_EXPORT int CVodeSetQuadSensErrCon(void *cvode_mem, booleantype errconQS);
1134+
SUNDIALS_EXPORT int CVodeSetQuadSensErrCon(void *cvode_mem, sunbooleantype errconQS);
11351135

11361136
/*
11371137
* -----------------------------------------------------------------
@@ -1838,12 +1838,12 @@ SUNDIALS_EXPORT int CVodeSetIterTypeB(void *cvode_mem, int which, int iterB);
18381838
SUNDIALS_EXPORT int CVodeSetUserDataB(void *cvode_mem, int which, void *user_dataB);
18391839
SUNDIALS_EXPORT int CVodeSetMaxOrdB(void *cvode_mem, int which, int maxordB);
18401840
SUNDIALS_EXPORT int CVodeSetMaxNumStepsB(void *cvode_mem, int which, long int mxstepsB);
1841-
SUNDIALS_EXPORT int CVodeSetStabLimDetB(void *cvode_mem, int which, booleantype stldetB);
1841+
SUNDIALS_EXPORT int CVodeSetStabLimDetB(void *cvode_mem, int which, sunbooleantype stldetB);
18421842
SUNDIALS_EXPORT int CVodeSetInitStepB(void *cvode_mem, int which, sunrealtype hinB);
18431843
SUNDIALS_EXPORT int CVodeSetMinStepB(void *cvode_mem, int which, sunrealtype hminB);
18441844
SUNDIALS_EXPORT int CVodeSetMaxStepB(void *cvode_mem, int which, sunrealtype hmaxB);
18451845

1846-
SUNDIALS_EXPORT int CVodeSetQuadErrConB(void *cvode_mem, int which, booleantype errconQB);
1846+
SUNDIALS_EXPORT int CVodeSetQuadErrConB(void *cvode_mem, int which, sunbooleantype errconQB);
18471847

18481848
/*
18491849
* =================================================================

0 commit comments

Comments
 (0)