|
|
@@ -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"); |
|
|
|