Add the enthalpy of formation

macros.h

@@ -22,6 +22,7 @@
 #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 Hf(i)       Hf[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

@@ -742,9 +742,10 @@ int residue(double t,
 	/*Aliases for various grid spacings:*/
 	double dpsip, dpsiav, dpsipm, dpsim, dpsimm;
 	/*define the heat release rate related parameters*/
-	double Tsp=298.0; 
+	//double Tsp=298.0; 
 	double HRR = 0 ; 
-	double Hf = 0 ;
+	double Hf[nsp]; 
+	//double Hf = 0 ;
 
 	dpsip=dpsiav=dpsipm=dpsim=dpsimm=ONE;
 	double mass, mdotIn;
@@ -901,9 +902,9 @@ int residue(double t,
 		
 		
 		/*Calculate the Heat Release Rate */
-		for (k = 1; k <=nsp; k++) {
-			Hf = enthalpy(k) - Cp(k) * (T(j)-Tsp) ; 
-			HRR = wdot(k) * Hf ; 
+		for(size_t k = 1; k <= nsp; k++) {
+			Hf(k) = data->gas->Hf298SS(k-1);
+			HRR = wdot(k) * Hf(k) ; 
 			HRRdata(j) = HRR ; 
 		}
 
@@ -1048,7 +1049,7 @@ void printSpaceTimeHeader(UserData data)
 	for (size_t k = 1; k <=data->nsp; k++) {
 		fprintf((data->output), "%15s\t",data->gas->speciesName(k-1).c_str());
 	}
-	fprintf((data->output), "%15s\t","HRR()");
+	fprintf((data->output), "%15s\t","HRR(J)");
 	fprintf((data->output), "%15s\n","Pressure(Pa)");
 
 }