/[ascend]/trunk/models/johnpye/fprops/water.c
ViewVC logotype

Diff of /trunk/models/johnpye/fprops/water.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2110 by jpye, Thu Feb 5 09:42:42 2009 UTC revision 2111 by jpye, Tue Dec 8 03:05:36 2009 UTC
# Line 31  const IdealData ideal_data_water = { Line 31  const IdealData ideal_data_water = {
31      , 6.6832105268 /* linear */      , 6.6832105268 /* linear */
32      , WATER_TSTAR /* Tstar */      , WATER_TSTAR /* Tstar */
33      , WATER_R /* cpstar J/kgK */      , WATER_R /* cpstar J/kgK */
34      , 1 /* power terms */        , 1 /* power terms */
35      , (const IdealPowTerm[]){      , (const IdealPowTerm[]){
36          {1. + 3.00632,  0}          {1. + 3.00632,  0}
37      }      }
# Line 129  const HelmholtzData helmholtz_data_water Line 129  const HelmholtzData helmholtz_data_water
129  };  };
130    
131  #ifdef TEST  #ifdef TEST
132    # include "test.h"
133  /*  /*
134      Test suite. These tests attempt to validate the current code using      Test suite. These tests attempt to validate the current code using
135      a few sample figures output by REFPROP 7.0.      a few sample figures output by REFPROP 7.0.
136    
137      To run the test, compile and run as follows:      To run the test, compile and run as follows:
138    
139      ./test.py water      ./test.py water
140  */  */
141    /*
 /*  
142      some code from freesteam, http://freesteam.sf.net/, which has been thoroughly      some code from freesteam, http://freesteam.sf.net/, which has been thoroughly
143      validated already.      validated already.
144  */  */
# Line 187  const TestDataIAPWS95 td[]; const unsign Line 187  const TestDataIAPWS95 td[]; const unsign
187  typedef struct{double T, p, rho_f, rho_g, h_f, h_g, s_f, s_g;} TestDataSat;  typedef struct{double T, p, rho_f, rho_g, h_f, h_g, s_f, s_g;} TestDataSat;
188  const TestDataSat tds[]; const unsigned ntds;  const TestDataSat tds[]; const unsigned ntds;
189    
190    const TestData td1[]; const unsigned ntd1;
191    
192  int main(void){  int main(void){
193      double rho, T;      double rho, T;
194      const HelmholtzData *d;      const HelmholtzData *d;
# Line 195  int main(void){ Line 197  int main(void){
197      double maxerr = 0;      double maxerr = 0;
198      unsigned i;      unsigned i;
199    
 /* a simple macro to actually do the testing */  
 #define ASSERT_TOL(FN,PARAM1,PARAM2,PARAM3,VAL,TOL) {\  
         double cval; cval = FN(PARAM1,PARAM2,PARAM3);\  
         double err; err = cval - (double)(VAL);\  
         double relerrpc = (cval-(VAL))/(VAL)*100;\  
         if(fabs(relerrpc)>maxerr)maxerr=fabs(relerrpc);\  
         if(fabs(err)>fabs(TOL)){\  
             fprintf(stderr,"ERROR in line %d: value of '%s(%f,%f,%s)' = %0.8f,"\  
                 " should be %f, error is %.10e (%.7f%%)!\n"\  
                 , __LINE__, #FN,PARAM1,PARAM2,#PARAM3, cval, VAL,cval-(VAL)\  
                 ,relerrpc\  
             );\  
             /*exit(1);*/\  
         }else{\  
             fprintf(stderr,"    OK, %s(%f,%f,%s) = %8.2e with %.8f%% err.\n"\  
                 ,#FN,PARAM1,PARAM2,#PARAM3,VAL,relerrpc\  
             );\  
         }\  
     }  
200    
201  #if 0  #if 0
202      /* these tests pass, but don't prove much */      /* these tests pass, but don't prove much */
# Line 223  int main(void){ Line 206  int main(void){
206              double delta = rho / d->rho_star;              double delta = rho / d->rho_star;
207              double tau = d->T_star / T;              double tau = d->T_star / T;
208              double p0 = phi0(delta,tau);              double p0 = phi0(delta,tau);
209                
210              ASSERT_TOL(helm_ideal, tau, delta, d->ideal, p0, p0*1e-5);              ASSERT_TOL(helm_ideal, tau, delta, d->ideal, p0, p0*1e-5);
211          }          }
212      }      }
# Line 240  int main(void){ Line 223  int main(void){
223      ASSERT_TOL(helm_ideal, tau, delta, d->ideal, 0.204797733E1, 1e-8);      ASSERT_TOL(helm_ideal, tau, delta, d->ideal, 0.204797733E1, 1e-8);
224      ASSERT_TOL(helm_ideal_tau, tau, delta, d->ideal, 0.904611106E1, 1e-8);      ASSERT_TOL(helm_ideal_tau, tau, delta, d->ideal, 0.904611106E1, 1e-8);
225      ASSERT_TOL(HELM_IDEAL_DELTAU, tau, delta, d->ideal, 0., 1e-8);      ASSERT_TOL(HELM_IDEAL_DELTAU, tau, delta, d->ideal, 0., 1e-8);
226        
227      double phitt = helm_ideal_tautau(tau, d->ideal);      double phitt = helm_ideal_tautau(tau, d->ideal);
228      double val = (-0.193249185E1);      double val = (-0.193249185E1);
229      double err = phitt - val;      double err = phitt - val;
# Line 264  int main(void){ Line 247  int main(void){
247    
248  #if 0  #if 0
249      fprintf(stderr,"\nADDITIONAL LOW-LEVEL TESTS NEAR CRITICAL POINT\n");      fprintf(stderr,"\nADDITIONAL LOW-LEVEL TESTS NEAR CRITICAL POINT\n");
250        
251      T = 647.; /* K */      T = 647.; /* K */
252      rho = 358.; /* kg/m³ */      rho = 358.; /* kg/m³ */
253      tau = d->T_star / T;      tau = d->T_star / T;
# Line 314  int main(void){ Line 297  int main(void){
297      }      }
298  #endif  #endif
299    
300    
301        helm_run_test_cases(d, ntd1, td1, 'K');
302    
303    
304      fprintf(stderr,"Tests completed OK (maximum error = %0.8f%%)\n",maxerr);      fprintf(stderr,"Tests completed OK (maximum error = %0.8f%%)\n",maxerr);
305      exit(0);      exit(0);
306  }  }
# Line 345  const TestDataSat tds[] = { Line 332  const TestDataSat tds[] = {
332    
333  const unsigned ntds = sizeof(tds)/sizeof(TestDataSat);  const unsigned ntds = sizeof(tds)/sizeof(TestDataSat);
334    
335    const TestData td1[] = {
336    /* {Temperature, Pressure, Density, Int. Energy, Enthalpy, Entropy, Cv, Cp, Cp0, Helmholtz}
337    , {(K), (MPa), (kg/m³), (kJ/kg), (kJ/kg), (kJ/kg-K), (kJ/kg-K), (kJ/kg-K), (kJ/kg-K), (kJ/kg)} */
338      {3.189563289E+2, 1.000000001E-2, 9.898332754E+2, 1.917958417E+2, 1.918059444E+2, 6.491956046E-1, 4.046584194E+0, 4.180521426E+0, 1.870066063E+0, -1.526920512E+1}
339    , {3.189563289E+2, 1.E-2, 6.816572231E-2, 2.437157373E+3, 2.583858672E+3, 8.148820193E+0, 1.461502908E+0, 1.940043153E+0, 1.870066063E+0, -1.619604013E+2}
340    , {3.2315E+2, 1.E-2, 6.726318947E-2, 2.443297379E+3, 2.591967105E+3, 8.174076459E+0, 1.451722526E+0, 1.927979811E+0, 1.871345196E+0, -1.98155429E+2}
341    , {3.7315E+2, 1.E-2, 5.815174873E-2, 2.515492539E+3, 2.687456413E+3, 8.448856586E+0, 1.439010754E+0, 1.905785033E+0, 1.889796623E+0, -6.371982961E+2}
342    , {4.2315E+2, 1.E-2, 5.124744725E-2, 2.587907788E+3, 2.783039458E+3, 8.689221881E+0, 1.455856293E+0, 1.91992654E+0, 1.913179444E+0, -1.088936451E+3}
343    , {4.7315E+2, 1.E-2, 4.581778713E-2, 2.661343451E+3, 2.879599299E+3, 8.904884547E+0, 1.480446696E+0, 1.943421402E+0, 1.939987342E+0, -1.552002673E+3}
344    , {5.2315E+2, 1.E-2, 4.143175055E-2, 2.736087559E+3, 2.977448348E+3, 9.101451358E+0, 1.508569718E+0, 1.971012253E+0, 1.969014174E+0, -2.025336719E+3}
345    , {5.7315E+2, 1.E-2, 3.781350306E-2, 2.812280523E+3, 3.076736317E+3, 9.282689277E+0, 1.538635313E+0, 2.000784008E+0, 1.999506331E+0, -2.508092837E+3}
346    , {6.2315E+2, 1.E-2, 3.477715717E-2, 2.890004655E+3, 3.177549722E+3, 9.451311366E+0, 1.569977036E+0, 2.031948029E+0, 2.031074092E+0, -2.999580023E+3}
347    , {6.7315E+2, 1.E-2, 3.219256212E-2, 2.969317897E+3, 3.279948656E+3, 9.609360266E+0, 1.602313357E+0, 2.064169523E+0, 2.06354145E+0, -3.499222966E+3}
348    , {7.2315E+2, 1.E-2, 2.996577198E-2, 3.050267542E+3, 3.383981621E+3, 9.758422179E+0, 1.635510876E+0, 2.097289044E+0, 2.096820368E+0, -4.006535457E+3}
349    , {7.7315E+2, 1.E-2, 2.802723909E-2, 3.132894879E+3, 3.489690637E+3, 9.899756057E+0, 1.669469567E+0, 2.131192649E+0, 2.130832398E+0, -4.521101516E+3}
350    , {8.2315E+2, 1.E-2, 2.632436164E-2, 3.217235633E+3, 3.597111891E+3, 1.003437659E+1, 1.704072662E+0, 2.165755593E+0, 2.165471942E+0, -5.042561456E+3}
351    , {8.7315E+2, 1.E-2, 2.481661209E-2, 3.303318766E+3, 3.706274655E+3, 1.016311063E+1, 1.739172311E+0, 2.200825204E+0, 2.20059735E+0, -5.57060128E+3}
352    , {9.2315E+2, 1.E-2, 2.347225746E-2, 3.391165031E+3, 3.817199895E+3, 1.028663753E+1, 1.774593372E+0, 2.236223291E+0, 2.236037125E+0, -6.104944404E+3}
353    , {9.7315E+2, 1.E-2, 2.226609485E-2, 3.480785909E+3, 3.929899239E+3, 1.04055192E+1, 1.81014454E+0, 2.271756554E+0, 2.27160221E+0, -6.645345105E+3}
354    , {1.02315E+3, 1.E-2, 2.1177853E-2, 3.572183128E+3, 4.044374525E+3, 1.052022323E+1, 1.845630764E+0, 2.307228588E+0, 2.307098991E+0, -7.191583272E+3}
355    , {1.07315E+3, 1.E-2, 2.019104172E-2, 3.665348772E+3, 4.160617918E+3, 1.063114098E+1, 1.880863969E+0, 2.342450386E+0, 2.342340346E+0, -7.743460174E+3}
356    , {3.2315E+2, 9.999999999E-2, 9.88034468E+2, 2.093161381E+2, 2.094173491E+2, 7.03768015E-1, 4.026185837E+0, 4.181345361E+0, 1.871345196E+0, -1.810649594E+1}
357    , {3.727559289E+2, 1.E-1, 9.586315058E+2, 4.173995952E+2, 4.175039106E+2, 1.302758106E+0, 3.770208021E+0, 4.215222877E+0, 1.889629913E+0, -6.821121265E+1}
358    , {3.727559289E+2, 1.E-1, 5.903439801E-1, 2.505554911E+3, 2.674947677E+3, 7.358848946E+0, 1.554798204E+0, 2.078449429E+0, 1.889629913E+0, -2.374996638E+2}
359    , {3.7315E+2, 1.E-1, 5.896694907E-1, 2.506179846E+3, 2.675766371E+3, 7.361044114E+0, 1.553500952E+0, 2.076616047E+0, 1.889796623E+0, -2.40593765E+2}
360    , {4.2315E+2, 1.E-1, 5.163554899E-1, 2.582937555E+3, 2.776602582E+3, 7.614753124E+0, 1.495922292E+0, 1.984639274E+0, 1.913179444E+0, -6.392452295E+2}
361    , {4.7315E+2, 1.E-1, 4.603136527E-1, 2.658207492E+3, 2.875450668E+3, 7.835560577E+0, 1.498840352E+0, 1.97540788E+0, 1.939987342E+0, -1.049187995E+3}
362    , {5.2315E+2, 1.E-1, 4.156009552E-1, 2.733898454E+3, 2.974513878E+3, 8.034578143E+0, 1.518412435E+0, 1.989344909E+0, 1.969014174E+0, -1.469391101E+3}
363    , {5.7315E+2, 1.E-1, 3.789536427E-1, 2.810648619E+3, 3.074533139E+3, 8.217155719E+0, 1.544520444E+0, 2.012414405E+0, 1.999506331E+0, -1.899014181E+3}
364    , {6.2315E+2, 1.E-1, 3.483167344E-1, 2.888732001E+3, 3.175827021E+3, 8.386583701E+0, 1.573789537E+0, 2.039869109E+0, 2.031074092E+0, -2.337367632E+3}
365    , {6.7315E+2, 1.E-1, 3.223007344E-1, 2.968292388E+3, 3.278561616E+3, 8.545151842E+0, 1.60493276E+0, 2.06984826E+0, 2.06354145E+0, -2.783876574E+3}
366    , {7.2315E+2, 1.E-1, 2.999224554E-1, 3.049420354E+3, 3.38283987E+3, 8.694565865E+0, 1.637392267E+0, 2.101520411E+0, 2.096820368E+0, -3.238054951E+3}
367    , {7.7315E+2, 1.E-1, 2.804629849E-1, 3.132181123E+3, 3.488734413E+3, 8.83614818E+0, 1.670868603E+0, 2.134442128E+0, 2.130832398E+0, -3.699486843E+3}
368    , {8.2315E+2, 1.E-1, 2.63382991E-1, 3.216624634E+3, 3.596299873E+3, 8.970949673E+0, 1.705142613E+0, 2.1683126E+0, 2.165471942E+0, -4.167812589E+3}
369    , {8.7315E+2, 1.E-1, 2.48269273E-1, 3.302788787E+3, 3.705577255E+3, 9.099819036E+0, 1.740009928E+0, 2.20287838E+0, 2.20059735E+0, -4.642718204E+3}
370    , {9.2315E+2, 1.E-1, 2.347995983E-1, 3.390700204E+3, 3.816595311E+3, 9.223449402E+0, 1.775262304E+0, 2.237900336E+0, 2.236037125E+0, -5.123927111E+3}
371    , {9.7315E+2, 1.E-1, 2.227188051E-1, 3.48037436E+3, 3.929371022E+3, 9.342411706E+0, 1.810688091E+0, 2.273146636E+0, 2.27160221E+0, -5.611193591E+3}
372    , {1.02315E+3, 1.E-1, 2.118221216E-1, 3.571815787E+3, 4.04391001E+3, 9.457179614E+0, 1.846079228E+0, 2.308395614E+0, 2.307098991E+0, -6.104297535E+3}
373    , {1.07315E+3, 1.E-1, 2.019432602E-1, 3.665018583E+3, 4.160207181E+3, 9.568148715E+0, 1.881239044E+0, 2.343441181E+0, 2.342340346E+0, -6.603040211E+3}
374    , {2.7315E+2, 9.999999999E-1, 1.000299823E+3, -2.386750479E-2, 9.758327621E-1, -8.83057426E-5, 4.212768783E+0, 4.21499383E+0, 1.859016668E+0, 2.532088014E-4}
375    , {3.2315E+2, 1.E+0, 9.884268719E+2, 2.091816549E+2, 2.101933635E+2, 7.033511679E-1, 4.023884681E+0, 4.179273344E+0, 1.871345196E+0, -1.810627503E+1}
376    , {3.7315E+2, 1.E+0, 9.587706558E+2, 4.187982943E+2, 4.198412966E+2, 1.30650822E+0, 3.766775608E+0, 4.213604828E+0, 1.889796623E+0, -6.872524791E+1}
377    , {4.2315E+2, 1.E+0, 9.173054424E+2, 6.314125646E+2, 6.32502714E+2, 1.841216103E+0, 3.522740375E+0, 4.305377986E+0, 1.913179444E+0, -1.476980293E+2}
378    , {4.530280079E+2, 1.E+0, 8.87129266E+2, 7.613878381E+2, 7.625150695E+2, 2.138064469E+0, 3.395415576E+0, 4.404483983E+0, 1.928874342E+0, -2.072152492E+2}
379    , {4.530280079E+2, 1.E+0, 5.14504078E+0, 2.582746685E+3, 2.777108604E+3, 6.58501587E+0, 1.927129916E+0, 2.71137544E+0, 1.928874342E+0, -4.004499369E+2}
380    , {4.7315E+2, 1.E+0, 4.853858846E+0, 2.622242827E+3, 2.828264476E+3, 6.69554277E+0, 1.751994047E+0, 2.428060519E+0, 1.939987342E+0, -5.457532341E+2}
381    , {5.2315E+2, 1.E+0, 4.296515473E+0, 2.710375674E+3, 2.943122421E+3, 6.926482857E+0, 1.635413152E+0, 2.210639279E+0, 1.969014174E+0, -9.132138326E+2}
382    , {5.7315E+2, 1.E+0, 3.876151216E+0, 2.793644527E+3, 3.051632398E+3, 7.124623603E+0, 1.609629028E+0, 2.142490116E+0, 1.999506331E+0, -1.289833491E+3}
383    , {6.2315E+2, 1.E+0, 3.539774495E+0, 2.875681064E+3, 3.158184936E+3, 7.302874374E+0, 1.614274876E+0, 2.124806261E+0, 2.031074092E+0, -1.675105102E+3}
384    , {6.7315E+2, 1.E+0, 3.26151893E+0, 2.957868639E+3, 3.264474249E+3, 7.466942243E+0, 1.632101688E+0, 2.129287554E+0, 2.06354145E+0, -2.068503531E+3}
385    , {7.2315E+2, 1.E+0, 3.026206863E+0, 3.04085417E+3, 3.371300846E+3, 7.620014696E+0, 1.656639334E+0, 2.14517287E+0, 2.096820368E+0, -2.469559457E+3}
386    , {7.7315E+2, 1.E+0, 2.823959952E+0, 3.124987737E+3, 3.479100407E+3, 7.764148141E+0, 1.685062689E+0, 2.167661231E+0, 2.130832398E+0, -2.877863398E+3}
387    , {8.2315E+2, 1.E+0, 2.647916223E+0, 3.210480109E+3, 3.588135562E+3, 7.900793975E+0, 1.715942015E+0, 2.194296955E+0, 2.165471942E+0, -3.293058452E+3}
388    , {8.7315E+2, 1.E+0, 2.493091684E+0, 3.297466869E+3, 3.698575262E+3, 8.031035658E+0, 1.748436361E+0, 2.223657972E+0, 2.20059735E+0, -3.714831916E+3}
389    , {9.2315E+2, 1.E+0, 2.355746133E+0, 3.386037351E+3, 3.810531309E+3, 8.155711647E+0, 1.781977108E+0, 2.254824526E+0, 2.236037125E+0, -4.142907856E+3}
390    , {9.7315E+2, 1.E+0, 2.233001083E+0, 3.476249057E+3, 3.924076873E+3, 8.27548677E+0, 1.816136292E+0, 2.287145707E+0, 2.27160221E+0, -4.577040893E+3}
391    , {1.02315E+3, 1.E+0, 2.12259597E+0, 3.568135659E+3, 4.039256878E+3, 8.39089749E+0, 1.850569806E+0, 2.320130186E+0, 2.307098991E+0, -5.017011107E+3}
392    , {1.07315E+3, 1.E+0, 2.022725587E+0, 3.661712039E+3, 4.156094473E+3, 8.502382625E+0, 1.884992128E+0, 2.353392072E+0, 2.342340346E+0, -5.462619875E+3}
393    , {2.7315E+2, 1.E+1, 1.004821445E+3, 1.17101466E-1, 1.006911837E+1, 3.375702801E-4, 4.172137191E+0, 4.172661376E+0, 1.859016668E+0, 2.489414397E-2}
394    , {3.2315E+2, 1.E+1, 9.923080019E+2, 2.078610372E+2, 2.179385534E+2, 6.991973729E-1, 4.001377763E+0, 4.159151637E+0, 1.871345196E+0, -1.808459384E+1}
395    , {3.7315E+2, 1.E+1, 9.629337501E+2, 4.162312969E+2, 4.266162273E+2, 1.299562803E+0, 3.753122152E+0, 4.193495052E+0, 1.889796623E+0, -6.870056315E+1}
396    , {4.2315E+2, 1.E+1, 9.223214984E+2, 6.272681485E+2, 6.381103549E+2, 1.83134534E+0, 3.514302485E+0, 4.277325212E+0, 1.913179444E+0, -1.476656319E+2}
397    , {4.7315E+2, 1.E+1, 8.70935282E+2, 8.443136059E+2, 8.557955153E+2, 2.317415003E+0, 3.312585903E+0, 4.449131602E+0, 1.939987342E+0, -2.52171303E+2}
398    , {5.2315E+2, 1.E+1, 8.057027666E+2, 1.073388393E+3, 1.085799918E+3, 2.779235189E+0, 3.152168139E+0, 4.793364634E+0, 1.969014174E+0, -3.805684961E+2}
399    , {5.7315E+2, 1.E+1, 7.152875259E+2, 1.329353574E+3, 1.343333966E+3, 3.248793807E+0, 3.049342906E+0, 5.680706465E+0, 1.999506331E+0, -5.326925965E+2}
400    , {5.84147147E+2, 1.E+1, 6.884236923E+2, 1.393537996E+3, 1.408063934E+3, 3.360647955E+0, 3.04378308E+0, 6.123699888E+0, 2.006365616E+0, -5.69574919E+2}
401    , {5.84147147E+2, 1.E+1, 5.546308524E+1, 2.545192344E+3, 2.725492447E+3, 5.615950441E+0, 3.106489802E+0, 7.140822363E+0, 2.006365616E+0, -7.353490841E+2}
402    , {6.2315E+2, 1.E+1, 4.456394017E+1, 2.699627008E+3, 2.924023683E+3, 5.945939056E+0, 2.307133509E+0, 4.011708323E+0, 2.031074092E+0, -1.005584915E+3}
403    , {6.7315E+2, 1.E+1, 3.782672181E+1, 2.833083224E+3, 3.097446603E+3, 6.21408075E+0, 2.008406843E+0, 3.095280944E+0, 2.06354145E+0, -1.349925233E+3}
404    , {7.2315E+2, 1.0E+1, 3.357766295E+1, 2.944524023E+3, 3.242341058E+3, 6.421857194E+0, 1.892748344E+0, 2.747256902E+0, 2.096820368E+0, -1.699442006E+3}
405    , {7.7315E+2, 1.0E+1, 3.047786995E+1, 3.047020511E+3, 3.37512743E+3, 6.599470302E+0, 1.846727708E+0, 2.583029415E+0, 2.130832398E+0, -2.055359953E+3}
406    , {8.2315E+2, 1.0E+1, 2.804697481E+1, 3.14541416E+3, 3.501958852E+3, 6.758456245E+0, 1.833325327E+0, 2.499449759E+0, 2.165471942E+0, -2.417809098E+3}
407    , {8.7315E+2, 1.0E+1, 2.605661173E+1, 3.241978445E+3, 3.625758198E+3, 6.904474568E+0, 1.837303527E+0, 2.45763722E+0, 2.20059735E+0, -2.786663523E+3}
408    , {9.2315E+2, 1.0E+1, 2.437954952E+1, 3.337939539E+3, 3.748119391E+3, 7.040751249E+0, 1.851394456E+0, 2.439892401E+0, 2.236037125E+0, -3.161729976E+3}
409    , {9.7315E+2, 1.0E+1, 2.293722219E+1, 3.434021058E+3, 3.869993641E+3, 7.169320693E+0, 1.871707067E+0, 2.43704202E+0, 2.27160221E+0, -3.542803373E+3}
410    , {1.02315E+3, 1.0E+1, 2.167749316E+1, 3.530675524E+3, 3.991983477E+3, 7.291560761E+0, 1.895952733E+0, 2.443848326E+0, 2.307098991E+0, -3.929684869E+3}
411    , {1.07315E+3, 1.0E+1, 2.056387915E+1, 3.628195554E+3, 4.114485127E+3, 7.408454575E+0, 1.922680153E+0, 2.457089677E+0, 2.342340346E+0, -4.322187472E+3}
412    , {2.7315E+2, 1.E+2, 1.045277961E+3, -2.637275578E-1, 9.540460535E+1, -8.514665416E-3, 3.876084092E+0, 3.905222088E+0, 1.859016668E+0, 2.062053301E+0}
413    , {3.2315E+2, 1.E+2, 1.027427394E+3, 1.965895902E+2, 2.939200688E+2, 6.586511576E-1, 3.819599562E+0, 4.007073837E+0, 1.871345196E+0, -1.625353138E+1}
414    , {3.7315E+2, 1.E+2, 9.997617888E+2, 3.950856416E+2, 4.951094684E+2, 1.237476322E+0, 3.63626859E+0, 4.038493344E+0, 1.889796623E+0, -6.667864774E+1}
415    , {4.2315E+2, 1.E+2, 9.648461536E+2, 5.942862812E+2, 6.979297477E+2, 1.74750239E+0, 3.440192741E+0, 4.078104116E+0, 1.913179444E+0, -1.451693553E+2}
416    , {4.7315E+2, 1.E+2, 9.237401722E+2, 7.951412987E+2, 9.033968482E+2, 2.206386951E+0, 3.265242003E+0, 4.146005201E+0, 1.939987342E+0, -2.488106871E+2}
417    , {5.2315E+2, 1.E+2, 8.766596304E+2, 9.990587289E+2, 1.113128086E+3, 2.627674113E+0, 3.115848843E+0, 4.249854061E+0, 1.969014174E+0, -3.756089831E+2}
418    , {5.7315E+2, 1.E+2, 8.231712403E+2, 1.207646962E+3, 1.329128368E+3, 3.021897882E+0, 2.989179757E+0, 4.398661362E+0, 1.999506331E+0, -5.243538094E+2}
419    , {6.2315E+2, 1.E+2, 7.623392982E+2, 1.422807219E+3, 1.553982406E+3, 3.39791169E+0, 2.882467043E+0, 4.606987675E+0, 2.031074092E+0, -6.946014508E+2}
420    , {6.7315E+2, 1.00E+2, 6.929323479E+2, 1.646833758E+3, 1.79114799E+3, 3.763862515E+0, 2.794240764E+0, 4.894179762E+0, 2.06354145E+0, -8.868102945E+2}
421    , {7.2315E+2, 1.00E+2, 6.141579063E+2, 1.881911419E+3, 2.044735994E+3, 4.127090222E+0, 2.721899763E+0, 5.257678333E+0, 2.096820368E+0, -1.102593875E+3}
422    , {7.7315E+2, 1.00E+2, 5.282753857E+2, 2.126902829E+3, 2.316198038E+3, 4.489951453E+0, 2.655731575E+0, 5.568760706E+0, 2.130832398E+0, -1.344503137E+3}
423    , {8.2315E+2, 1.00E+2, 4.445529254E+2, 2.370975956E+3, 2.595921051E+3, 4.840535578E+0, 2.579333742E+0, 5.551646507E+0, 2.165471942E+0, -1.613510905E+3}
424    , {8.7315E+2, 1.00E+2, 3.742083364E+2, 2.597857316E+3, 2.865088134E+3, 5.158097698E+0, 2.488254086E+0, 5.168197415E+0, 2.20059735E+0, -1.905935689E+3}
425    , {9.2315E+2, 1.00E+2, 3.210161055E+2, 2.798941134E+3, 3.110451984E+3, 5.431492476E+0, 2.398456988E+0, 4.644743601E+0, 2.236037125E+0, -2.215141145E+3}
426    , {9.7315E+2, 1.00E+2, 2.820395674E+2, 2.976091183E+3, 3.330651364E+3, 5.663895105E+0, 2.325486994E+0, 4.181032807E+0, 2.27160221E+0, -2.535728338E+3}
427    , {1.02315E+3, 1.00E+2, 2.529966112E+2, 3.13520167E+3, 3.530463881E+3, 5.864193269E+0, 2.27341142E+0, 3.829832992E+0, 2.307098991E+0, -2.864747673E+3}
428    , {1.07315E+3, 1.E+2, 2.306404366E+2, 3.281691849E+3, 3.715267165E+3, 6.04058851E+0, 2.239640928E+0, 3.576379581E+0, 2.342340346E+0, -3.20076571E+3}
429    };
430    
431    const unsigned ntd1 = sizeof(td1)/sizeof(TestData);
432    
433  #endif  #endif
434    

Legend:
Removed from v.2110  
changed lines
  Added in v.2111

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22