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

Log of /trunk/models/johnpye/fprops/fluids/water.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 2301 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Aug 21 13:28:35 2010 UTC (13 years, 9 months ago) by jpye
File length: 25425 byte(s)
Diff to previous 2300
Regen toluene model working, next water.

Revision 2300 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 20 13:50:05 2010 UTC (13 years, 9 months ago) by jpye
File length: 25499 byte(s)
Diff to previous 2299
Fixing test routine.

Revision 2299 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 20 06:53:38 2010 UTC (13 years, 9 months ago) by jpye
File length: 25496 byte(s)
Diff to previous 2298
Automatic generation of the fluids list completed now (hopefully).

Revision 2298 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 20 05:50:25 2010 UTC (13 years, 9 months ago) by jpye
File length: 25493 byte(s)
Copied from: trunk/models/johnpye/fprops/water.c revision 2297
Diff to previous 2297
moving fluids to subdirectory.

Revision 2297 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 20 05:47:43 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25493 byte(s)
Diff to previous 2271
Working on streamlined system for adding/retrieving fluids.

Revision 2271 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Aug 8 12:17:00 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25489 byte(s)
Diff to previous 2262
Removed p_t, p_c from HelmholtzData, added routines that calculate those values directly.
'satcvgc.py' now runs without errors for 100% of data points.

Revision 2262 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Aug 5 08:34:43 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25564 byte(s)
Diff to previous 2261
Deleted sat2.c and sat2.h, that code is not being used anywhere in ASCEND/FPROPS now. REFPROP algorithm replaced by Akasaka approach.
Moving sat3.c code into sat.h.

Revision 2261 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Aug 5 07:41:31 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 26257 byte(s)
Diff to previous 2250
First attempt at Akasaka algorithm. But something's badly broken in the test suite, need to go find what.

Revision 2250 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Aug 3 13:56:52 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 26237 byte(s)
Diff to previous 2235
Fixed error in helmholtz_g (another one).
fprops_sat_p is working for simple cases now.
Added p_t value for water from IAPWS95 rev 2009.

Revision 2235 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jul 29 08:45:54 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 26195 byte(s)
Diff to previous 2230
we'll satisfy ourselves with a finite difference approximation of helm_resid_deldeldel for the moment, and
move on with the saturation curve problem.

Revision 2230 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 27 01:56:55 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 26095 byte(s)
Diff to previous 2228
Fixed error with use of 'abs' instead of 'fabs' in sat2.c.
This fixes convergence of CO2 and H2O everywhere except close to critical point.

Revision 2228 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 26 13:20:51 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25721 byte(s)
Diff to previous 2225
Add 'name' and 'T_t' (triple-point temperature) to HelmholtzData struct.
Add satcvgc.py for quick check of convergence of fprops_sat_T routine over 'all' fluids.

Revision 2225 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 26 03:40:18 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25690 byte(s)
Diff to previous 2224
Added python bindings for new function. 
We can see that it's not converging for about 10% of cases.

Revision 2224 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jul 26 01:14:48 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25697 byte(s)
Diff to previous 2223
Saturation curve is converging now, for CO2 and water, but haven't yet tested its 'safe' range.
There will certainly still be problems near the critical point.

Revision 2223 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jul 25 23:58:36 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25618 byte(s)
Diff to previous 2222
correct to Helmholtz energy, instead of Gibbs, according IAPWS95 release.

Revision 2222 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jul 25 14:45:45 2010 UTC (13 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 25598 byte(s)
Diff to previous 2117
numerical algorithms for saturation curve. algorithms are based on those used by REFPROP, but the code is a new implementation. hoping that this is all legally correct; please let me know if there are any issues -- JP.

Revision 2117 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 9 04:30:18 2009 UTC (14 years, 5 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 24823 byte(s)
Diff to previous 2113
Improving Python build of FPROPS.
Added spinodal.py for visualisation of spinodal points.
Added placeholder critical and triple point data for the other fluids (needs to be filled in).
Allow peering inside helmholtz data form Python (eg to access critical point data).

Revision 2113 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 8 03:37:27 2009 UTC (14 years, 5 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 24736 byte(s)
Diff to previous 2111
Update copyright info. Add citation for CO2.

Revision 2111 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 8 03:05:36 2009 UTC (14 years, 5 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 24731 byte(s)
Diff to previous 1996
CO2 correlation looks to be working now.
Work on support for SUNDIALS on Windows.

Revision 1996 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Feb 5 09:42:42 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 11364 byte(s)
Diff to previous 1994
Added acentric factor to HelmholtzData.
Working on adding calculation of saturation curve using Maxwell phase-equilibrium condition (per IAPWS95).

Revision 1994 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Feb 4 03:52:36 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 10089 byte(s)
Diff to previous 1990
Still some error near critical point for calculation of speed of sound.
However this error is not reconcilable with both IAPWS95 and REFPROP8, because those
two sources give different values. The value returned by FPROPS is midway between
the two.

Revision 1990 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 11:12:40 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 9687 byte(s)
Diff to previous 1989
Added critical terms to helm_resid_deldel and helm_resid_deltau.
Tests are still not passing though, need to check for errors.

Revision 1989 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 07:29:29 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 9687 byte(s)
Diff to previous 1988
Added helmholtz_w and helmholtz_cp.
Added test for helmholtz_w with water.
This exposes the fact that helm_resid_deldel and helm_resid_deltau need critical terms added.

Revision 1988 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 05:38:33 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 9594 byte(s)
Diff to previous 1986
Added critical terms to helm_resid_tautau.
Tests for water for cv pass.

Revision 1986 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 05:19:15 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 9542 byte(s)
Diff to previous 1985
Fixed helm_resid and helm_resid_del with critical terms.

Revision 1985 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 3 01:15:17 2009 UTC (15 years, 3 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 7536 byte(s)
Diff to previous 1904
Added critical term calculation in helm_resid.
Added gaussian and critical term values for water from IAPWS95.
Added some test data from IAPWS95 to water.c tests.

Revision 1904 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Sep 27 03:32:21 2008 UTC (15 years, 7 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 5977 byte(s)
Diff to previous 1875
Removed redundant HelmholtzExpTerm, and corrected nitrogen.c to use
HelmholtzGausTerm instead.

Revision 1875 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 18 04:30:49 2008 UTC (15 years, 8 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 5898 byte(s)
Diff to previous 1874
Fixed water helm_ideal calculation.

Revision 1874 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 18 04:27:16 2008 UTC (15 years, 8 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 5898 byte(s)
Diff to previous 1873
Added some GPL headers, fixing water helm_ideal coefficients.

Revision 1873 - (view) (download) (as text) (annotate) - [select for diffs]
Added Thu Sep 18 02:34:54 2008 UTC (15 years, 8 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/water.c
File length: 5064 byte(s)
Adding water to fluids set (for the purpose of debuggin using freesteam code).

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

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