add heatRR inside residue

UserData.cpp

@@ -354,8 +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);
 }
 

UserData.h

@@ -162,8 +162,7 @@ typedef struct UserDataTag{
 	double flamePosition[2];
 	double flameTime[2];
 	size_t nTimeSteps;
-	/*heat release rate (HRR) data */
-	double* HRRdata;
+
 } *UserData;
 UserData allocateUserData(FILE *input);
 void setSaneDefaults(UserData data);

macros.h

@@ -23,6 +23,7 @@
 #define P(i)   ydata[((i-1)*data->nvar)+data->np]
 #define HRRdata(i)  HRRdata[i-1]
 #define Hf(i)       Hf[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]

residue.cpp

@@ -741,10 +741,13 @@ int residue(double t,
 	double cendfm, cendfc, cendfp;
 	/*Aliases for various grid spacings:*/
 	double dpsip, dpsiav, dpsipm, dpsim, dpsimm;
+
 	/*define the heat release rate related parameters*/
 	//double Tsp=298.0; 
 	double HRR = 0 ; 
 	double Hf[nsp]; 
+	double heatRR[npts]; 
+
 	//double Hf = 0 ;
 
 	dpsip=dpsiav=dpsipm=dpsim=dpsimm=ONE;
@@ -759,7 +762,7 @@ int residue(double t,
 
 	/*Initialize the HRR data*/ 
 	for (j=1; j<= npts ; j++) {
-		HRRdata(j) = 0 ;
+		heatRR(j) = 0 ;
 	}
 
 //	/*evaluate properties at j=1*************************/
@@ -904,8 +907,8 @@ int residue(double t,
 		/*Calculate the Heat Release Rate */
 		for(size_t k = 1; k <= nsp; k++) {
 			Hf(k) = data->gas->Hf298SS(k-1);
-			HRR = wdot(k) * Hf(k) ; 
-			HRRdata(j) = HRR ; 
+			HRR = - wdot(k) * Hf(k) ; 
+			heatRR(j) = HRR + heatRR(j); 
 		}
 
 	//	//energy formulation:
@@ -1032,6 +1035,11 @@ int residue(double t,
 	//	//Tres(j)=Tdot(j);
 	//}
 
+	/**/
+	for (j=1 ; j<=npts ; j++) { 
+		HRRdata(j) =  heatRR(j) ; 
+	}
+	
 	return(0);
 
 }