/[ascend]/branches/fprops-incomp/models/johnpye/fprops/fluids/chloridesalt.c
ViewVC logotype

Log of /branches/fprops-incomp/models/johnpye/fprops/fluids/chloridesalt.c

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 3471 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 18 11:03:57 2020 UTC (3 months, 1 week ago) by jpye
File length: 5843 byte(s)
Diff to previous 3443
removed TC for sodium from chloridesalt file.


Revision 3443 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 4 12:53:25 2020 UTC (3 months, 3 weeks ago) by jpye
File length: 5876 byte(s)
Diff to previous 3442
wow, annoying bug with wrong fluid name in eos_chloridesalt!
added trivial solve_pT functions at least for incompressible (not implemented yet for helmholtz/pengrob.



Revision 3442 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 4 09:06:08 2020 UTC (3 months, 3 weeks ago) by jpye
File length: 5870 byte(s)
Diff to previous 3440
improved correlation for chloride salt properties


Revision 3440 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 4 08:27:58 2020 UTC (3 months, 3 weeks ago) by jpye
File length: 5869 byte(s)
Diff to previous 3439
added chloridesalt medium (incompressible), with verification.
towerarray model corrected to work with sodiumn fluid.


Revision 3439 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 4 07:26:05 2020 UTC (3 months, 3 weeks ago) by jpye
File length: 5815 byte(s)
Copied from: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c revision 3437
Diff to previous 3434
adding chloride salt


Revision 3434 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 2 09:29:04 2020 UTC (3 months, 3 weeks ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 6732 byte(s)
Diff to previous 3431
removed 'use_guess' from fprops_solve_ph call (appeared not to be fully implemented in any case?)
added fprops_solve_ph_incomp, modified fprops_solve_ph to use this function where required.
added a small test case of fprops_solve_ph for sodium.


Revision 3431 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 2 07:35:21 2020 UTC (3 months, 3 weeks ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 6233 byte(s)
Diff to previous 3429
changed calling convention of fprops_solve_ph, fprops_solve_px, fprops_solve_Tx.
added testing of viscosity for sodium (incompressible)
part-way through implementing support for incompressible fluids in python/ascend interfaces.


Revision 3429 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 1 11:06:23 2020 UTC (3 months, 3 weeks ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 5757 byte(s)
Diff to previous 3428
data structures for viscosity of sodium


Revision 3428 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 1 07:49:12 2020 UTC (3 months, 4 weeks ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 5472 byte(s)
Diff to previous 3426
added test for calculation of s.


Revision 3426 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 1 03:16:55 2020 UTC (3 months, 4 weeks ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 4595 byte(s)
Diff to previous 3425
enthalpy calculation for sodium working now. also refstate for incompressible fluids modified.


Revision 3425 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 31 05:15:08 2020 UTC (3 months, 4 weeks ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 4664 byte(s)
Diff to previous 3424
working on cp0 update


Revision 3424 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 23 23:18:27 2020 UTC (4 months ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 3708 byte(s)
Diff to previous 3423
adding thermal conductivity poly(T) for sodium


Revision 3423 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 21 08:29:09 2020 UTC (4 months, 1 week ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/sodium.c
File length: 2596 byte(s)
Copied from: branches/fprops-incomp/models/johnpye/fprops/fluids/toluene.c revision 3422
Diff to previous 3422
work-in-progress on implementation of incompressible fluid routines.


Revision 3422 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 18 02:36:14 2020 UTC (4 months, 1 week ago) by jpye
Original Path: branches/fprops-incomp/models/johnpye/fprops/fluids/toluene.c
File length: 9707 byte(s)
Diff to previous 3330
adding branch for incompressible fluid properties


Revision 3330 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 15 11:18:41 2018 UTC (2 years, 4 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 9707 byte(s)
Diff to previous 2664
all helmholtz fluids are included in CUnit tests for FPROPS now.
some issue with oxygen?


Revision 2664 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 18 06:02:15 2013 UTC (7 years, 4 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 9907 byte(s)
Diff to previous 2660
Trying to debug fprops_triple_point for Toluene with pengrob correlation. Something strange is happening with fratio.

Revision 2660 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 16 05:57:03 2013 UTC (7 years, 4 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 9908 byte(s)
Diff to previous 2659
Working on updating rankine_fprops and associated models to work with new fprops2 code.
Some issue discovered with (p,h) for water (added python/solve_ph1.py to check it).
Next cunit tests to drive some ASCEND models embedding FPROPS (note use of slvreq for this).

Revision 2659 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 16 03:09:20 2013 UTC (7 years, 4 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 10112 byte(s)
Diff to previous 2654
Change toluene default reference state to REF_TPF, fixes rankine_fprops model. How to specify reference states via the ASCEND wrapper, then?

Revision 2654 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 16 02:04:07 2013 UTC (7 years, 4 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 9869 byte(s)
Diff to previous 2300
Merged (copied) fprops2 branch to trunk. This copy overwrites the trunk version of fprops,
and history is preserved via the fprops2 sequence. I hope that's OK...

Revision 2300 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 20 13:50:05 2010 UTC (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 10151 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 (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 10148 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 (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/fluids/toluene.c
File length: 10145 byte(s)
Copied from: trunk/models/johnpye/fprops/toluene.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 (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/toluene.c
File length: 10145 byte(s)
Diff to previous 2286
Working on streamlined system for adding/retrieving fluids.

Revision 2286 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Aug 14 15:05:12 2010 UTC (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/toluene.c
File length: 10147 byte(s)
Diff to previous 2285
Working on plots for combined cycle. Something is broken with CO2 model.

Revision 2285 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Aug 14 13:47:07 2010 UTC (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/toluene.c
File length: 10154 byte(s)
Diff to previous 2284
Added routine to calculate ideal->m and ideal->c for desired reference state values.
Adjusted toluene reference state so that s=0, h=0 for liquid at the triple pt.

Revision 2284 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Aug 14 10:52:06 2010 UTC (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/toluene.c
File length: 9707 byte(s)
Diff to previous 2283
Working on combined cycle simulation using toluene in the bottoming cycle.
Seem to be getting negative values of h and s for toluene in some cases.

Revision 2283 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Aug 14 09:30:57 2010 UTC (9 years, 9 months ago) by jpye
Original Path: trunk/models/johnpye/fprops/toluene.c
File length: 9670 byte(s)
Diff to previous 2280
Add extra condition in sat.c to allow Akasaka algorithm to converge for toluene.

Revision 2280 - (view) (download) (as text) (annotate) - [select for diffs]
Added Sat Aug 14 08:16:37 2010 UTC (9 years, 9 months ago) by hongke
Original Path: trunk/models/johnpye/fprops/toluene.c
File length: 9913 byte(s)
jpye: Merging r2695:3040 from 'hongke' branch into trunk. Thanks HongKe for all your work!

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