From 38abb36cb6e7f933309ec542960085053b177892 Mon Sep 17 00:00:00 2001 From: Weiye Wang Date: Wed, 12 Oct 2022 15:34:09 -0700 Subject: [PATCH] save the change --- UserData.cpp | 2 +- macros.h | 4 ++-- residue.cpp | 14 +++++--------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/UserData.cpp b/UserData.cpp index 6323a17..777aae0 100644 --- a/UserData.cpp +++ b/UserData.cpp @@ -354,7 +354,7 @@ UserData allocateUserData(FILE *input){ //data->ratesOutput=fopen("rates.dat","w"); data->innerMassFractions = new double [data->nsp]; - data->HRRdata = new double [data->npts] ; + data->HRRdata = new double [data->npts]; return(data); } diff --git a/macros.h b/macros.h index 2deaf3b..e7f1687 100644 --- a/macros.h +++ b/macros.h @@ -21,9 +21,9 @@ #define Y(i,k) ydata[((i-1)*data->nvar)+data->ny+k-1] #define R(i) ydata[((i-1)*data->nvar)+data->nr] #define P(i) ydata[((i-1)*data->nvar)+data->np] -#define HRRdata(i) HRRdata[i-1] +#define HRRdata(i) data->HRRdata[i-1] #define Hf(i) Hf[i-1] -#define heatRR(i) heatRR[i-1] +//#define heatRR(i) heatRR[i-1] #define Tdot(i) ydotdata[((i-1)*data->nvar)+data->nt] #define Ydot(i,k) ydotdata[((i-1)*data->nvar)+data->ny+k-1] diff --git a/residue.cpp b/residue.cpp index 46b0a81..d3854c3 100644 --- a/residue.cpp +++ b/residue.cpp @@ -746,7 +746,7 @@ int residue(double t, //double Tsp=298.0; double HRR = 0 ; double Hf[nsp]; - double heatRR[npts]; + //double heatRR[npts]; //double Hf = 0 ; @@ -762,7 +762,7 @@ int residue(double t, /*Initialize the HRR data*/ for (j=1; j<= npts ; j++) { - heatRR(j) = 0 ; + HRRdata(j) = 0 ; } // /*evaluate properties at j=1*************************/ @@ -908,7 +908,7 @@ int residue(double t, for(size_t k = 1; k <= nsp; k++) { Hf(k) = data->gas->Hf298SS(k-1); HRR = - wdot(k) * Hf(k) ; - heatRR(j) = HRR + heatRR(j); + HRRdata(j) = HRR + HRRdata(j); } // //energy formulation: @@ -1035,11 +1035,7 @@ int residue(double t, // //Tres(j)=Tdot(j); //} - /**/ - for (j=1 ; j<=npts ; j++) { - HRRdata(j) = heatRR(j) ; - } - + return(0); } @@ -1084,7 +1080,7 @@ void printSpaceTimeOutput(double t, N_Vector* y, FILE* output, UserData data) for (size_t j = 0; j < data->nvar; j++) { fprintf(output, "%15.9e\t",ydata[j+i*data->nvar]); } - fprintf(output,"%15.6e\t",HRRdata(i+1)); + fprintf(output,"%15.6e\t",data->HRRdata[i]); fprintf(output, "\n"); } fprintf(output, "\n\n");