/[ascend]/trunk/models/johnpye/fprops

Log of /trunk/models/johnpye/fprops

View Directory Listing Directory Listing

Sticky Revision:

Revision 2824 - Directory Listing
Modified Tue Feb 17 06:55:13 2015 UTC (8 years, 7 months ago) by jpye

replace some missing svn:ignore rules on various directories

Revision 2806 - Directory Listing
Modified Wed Jul 23 01:24:18 2014 UTC (9 years, 2 months ago) by jpye

reduce debug output

Revision 2803 - Directory Listing
Modified Fri Jul 18 13:39:48 2014 UTC (9 years, 2 months ago) by jpye

reduced debug output

Revision 2799 - Directory Listing
Modified Thu Jul 17 23:35:53 2014 UTC (9 years, 2 months ago) by jpye

add wall width for wallfreeconvection. 
add biblio note for CO2.

Revision 2797 - Directory Listing
Modified Thu Jul 17 08:26:23 2014 UTC (9 years, 2 months ago) by jpye

suppressing various debug output.
changed default value of safe_print_errors to FALSE (need to review this in context of GUI layer)

Revision 2791 - Directory Listing
Modified Wed Jun 25 10:08:42 2014 UTC (9 years, 3 months ago) by jpye

add new reference state TPHS0 (needs checking still)
using TPHS0 as reference state for oxygen

Revision 2790 - Directory Listing
Modified Wed Jun 25 09:25:00 2014 UTC (9 years, 3 months ago) by jpye

added test data for oxygen

Revision 2789 - Directory Listing
Modified Wed Jun 25 09:07:29 2014 UTC (9 years, 3 months ago) by jpye

Starting on support for Oxygen, no test data yet.

Revision 2788 - Directory Listing
Modified Wed Jun 25 06:39:09 2014 UTC (9 years, 3 months ago) by jpye

kludgy fix to restore test solver_qrslv to non-crashing state (thcond missing data workaround in FPROPS)

Revision 2778 - Directory Listing
Modified Fri Mar 28 02:09:47 2014 UTC (9 years, 6 months ago) by jpye

thermophys.a4c working now, still not two-phase values though.

Revision 2777 - Directory Listing
Modified Thu Mar 27 23:15:36 2014 UTC (9 years, 6 months ago) by jpye

add test of mu,k to ASCEND wrapper for FPROPS. starting to work...
added 'uPa' to measures.
added note about pipe.a4c not yet calculating k,mu.

Revision 2776 - Directory Listing
Modified Thu Mar 27 12:48:14 2014 UTC (9 years, 6 months ago) by jpye

add thcond,visc to ascend wrapper (only CO2 implemented/working at this stage)

Revision 2775 - Directory Listing
Modified Thu Mar 27 12:32:40 2014 UTC (9 years, 6 months ago) by jpye

plot of co2 thcond, problems with saturation region.

Revision 2774 - Directory Listing
Modified Thu Mar 27 11:42:30 2014 UTC (9 years, 6 months ago) by jpye

thcond and mu accessible from Python

Revision 2773 - Directory Listing
Modified Thu Mar 27 09:21:39 2014 UTC (9 years, 6 months ago) by jpye

checking marks

Revision 2772 - Directory Listing
Modified Thu Mar 27 09:21:24 2014 UTC (9 years, 6 months ago) by jpye

a little cleaning up of test output

Revision 2771 - Directory Listing
Modified Thu Mar 27 09:17:10 2014 UTC (9 years, 6 months ago) by jpye

thcond sort-of working, agrees with REFPROP to ~0.1%.

Revision 2770 - Directory Listing
Modified Thu Mar 27 08:49:40 2014 UTC (9 years, 6 months ago) by jpye

still looking at thcond lamc...

Revision 2769 - Directory Listing
Modified Thu Mar 27 08:36:59 2014 UTC (9 years, 6 months ago) by jpye

spreadsheet implementation for lamc, using it to check correlation and thcond.c for CO2.

Revision 2768 - Directory Listing
Modified Thu Mar 27 06:42:18 2014 UTC (9 years, 6 months ago) by jpye

working on lamc debugging for CO2

Revision 2767 - Directory Listing
Modified Thu Mar 27 04:45:06 2014 UTC (9 years, 6 months ago) by jpye

debugging lamc function (critical enhancement of thermal conductivity)

Revision 2766 - Directory Listing
Modified Wed Mar 26 13:10:05 2014 UTC (9 years, 6 months ago) by jpye

thcond working ok for co2, but no critical enhancement yet

Revision 2765 - Directory Listing
Modified Wed Mar 26 06:54:48 2014 UTC (9 years, 6 months ago) by jpye

thcond includes lamr.

Revision 2764 - Directory Listing
Modified Wed Mar 26 06:54:19 2014 UTC (9 years, 6 months ago) by jpye

added lamr, lamr+lam0 tests for CO2 -- passing.

Revision 2763 - Directory Listing
Modified Tue Mar 25 23:54:44 2014 UTC (9 years, 6 months ago) by jpye

added lamr test

Revision 2762 - Directory Listing
Modified Tue Mar 25 08:44:18 2014 UTC (9 years, 6 months ago) by jpye

lam0 fixed :-/

Revision 2761 - Directory Listing
Modified Tue Mar 25 08:28:58 2014 UTC (9 years, 6 months ago) by jpye

added debug spreadsheet for lam0 for CO2.

Revision 2760 - Directory Listing
Modified Mon Mar 24 06:20:40 2014 UTC (9 years, 6 months ago) by jpye

working more on thermal conductivity, trying to get agreement on lam0 from different sources.

Revision 2759 - Directory Listing
Modified Fri Mar 21 11:25:55 2014 UTC (9 years, 6 months ago) by jpye

thcond test for nitrogen.

Revision 2758 - Directory Listing
Modified Fri Mar 21 08:00:18 2014 UTC (9 years, 6 months ago) by jpye

extending to nitrogen

Revision 2757 - Directory Listing
Modified Thu Mar 20 06:36:28 2014 UTC (9 years, 6 months ago) by jpye

more on thcond

Revision 2756 - Directory Listing
Modified Thu Mar 20 06:07:13 2014 UTC (9 years, 6 months ago) by jpye

working on test code for thcond.

Revision 2755 - Directory Listing
Modified Thu Mar 20 05:51:57 2014 UTC (9 years, 6 months ago) by jpye

starting work on thermal conductivity implementation (with CO2 as first candidate).

Revision 2754 - Directory Listing
Modified Wed Mar 19 05:59:30 2014 UTC (9 years, 6 months ago) by jpye

starting on thermal conductivity

Revision 2753 - Directory Listing
Modified Wed Mar 19 01:34:08 2014 UTC (9 years, 6 months ago) by jpye

viscosity working for both CO2 and nitrogen. some disagreement with original publication for CO2, perhaps due to different EOS? will leave it for now as errors are <1%.

Revision 2752 - Directory Listing
Modified Tue Mar 11 12:46:51 2014 UTC (9 years, 6 months ago) by jpye

viscosity routine now matching sample data from Lemmon/Jacobsen paper.

Revision 2751 - Directory Listing
Modified Tue Mar 11 10:44:09 2014 UTC (9 years, 6 months ago) by jpye

viscosity test running, but wrong.

Revision 2750 - Directory Listing
Modified Mon Mar 10 23:46:29 2014 UTC (9 years, 6 months ago) by jpye

viscosity test case started

Revision 2748 - Directory Listing
Modified Sun Mar 9 03:03:26 2014 UTC (9 years, 6 months ago) by jpye

more on viscosity calculation, including initialisation, and CO2 data.

Revision 2747 - Directory Listing
Modified Sat Mar 8 10:46:30 2014 UTC (9 years, 6 months ago) by jpye

part of the viscosity calculation implemented

Revision 2746 - Directory Listing
Modified Sat Mar 8 04:28:08 2014 UTC (9 years, 6 months ago) by jpye

viscosity data for CO2 partly implemented

Revision 2745 - Directory Listing
Modified Sat Mar 8 03:49:37 2014 UTC (9 years, 6 months ago) by jpye

starting on viscosity support in FPROPS

Revision 2743 - Directory Listing
Modified Fri Feb 28 06:55:01 2014 UTC (9 years, 6 months ago) by jpye

add liquid sodium properties.

Revision 2741 - Directory Listing
Modified Tue Jan 28 14:01:06 2014 UTC (9 years, 7 months ago) by jpye

update comments

Revision 2740 - Directory Listing
Modified Tue Jan 28 13:58:59 2014 UTC (9 years, 7 months ago) by jpye

linear dish array model, with pressure drops in pipe segments, first attempt

Revision 2739 - Directory Listing
Modified Thu Dec 12 12:33:26 2013 UTC (9 years, 9 months ago) by jpye

cp0 problem appears to be when cp0red==1 in cp0_prepare with IDEAL_CP0 data type.

Revision 2738 - Directory Listing
Modified Thu Dec 12 08:21:07 2013 UTC (9 years, 9 months ago) by jpye

more debugging of cp0 and ideal_cp, pengrob_cp (both seem incorrect)

Revision 2737 - Directory Listing
Modified Wed Dec 11 12:53:49 2013 UTC (9 years, 9 months ago) by jpye

more on cp

Revision 2736 - Directory Listing
Modified Wed Dec 11 11:09:29 2013 UTC (9 years, 9 months ago) by jpye

debugging problem with cp0

Revision 2735 - Directory Listing
Modified Tue Dec 10 12:26:54 2013 UTC (9 years, 9 months ago) by jpye

problem with cp0 in ideal gas case.

Revision 2734 - Directory Listing
Modified Tue Dec 10 12:11:46 2013 UTC (9 years, 9 months ago) by jpye

testing ideal calcs, cf example in Bejan Tsatsaronis & Moran.

Revision 2733 - Directory Listing
Modified Tue Dec 10 11:14:47 2013 UTC (9 years, 9 months ago) by jpye

ReferenceState TPHG fixed for ideal EOS.

Revision 2732 - Directory Listing
Modified Mon Dec 9 11:06:00 2013 UTC (9 years, 9 months ago) by jpye

add missing test file

Revision 2731 - Directory Listing
Modified Mon Dec 9 08:51:59 2013 UTC (9 years, 9 months ago) by jpye

still trying to get the TPHG reference start working for ideal gas. not working yet.

Revision 2730 - Directory Listing
Modified Mon Dec 9 08:32:08 2013 UTC (9 years, 9 months ago) by jpye

working on ideal gas EOS, and implementing enthalpy of formation/absolute entropy via reference state mechanism.

Revision 2728 - Directory Listing
Modified Fri Dec 6 08:39:44 2013 UTC (9 years, 9 months ago) by jpye

cleaned up refstate stuff in carbondioxide (test is still passing).
initial notes on FPROPS_REF_FORM for defining reference state relative
to enthalpy of formation at standard conditions.

Revision 2727 - Directory Listing
Modified Fri Dec 6 06:36:39 2013 UTC (9 years, 9 months ago) by jpye

add heat of formation to RPP data, so that chemical reactions can eventually be calculated.

Revision 2718 - Directory Listing
Modified Thu Dec 5 05:22:30 2013 UTC (9 years, 9 months ago) by jpye

specify correlation type to avoid warning.

Revision 2717 - Directory Listing
Modified Thu Dec 5 00:44:10 2013 UTC (9 years, 9 months ago) by jpye

Workaround for MinGW32 which doesn't provide cpow function.

Revision 2711 - Directory Listing
Modified Sun Aug 18 11:16:09 2013 UTC (10 years, 1 month ago) by jpye

cleaning up (hopefully) a few compiler warnings.

Revision 2705 - Directory Listing
Modified Mon May 27 06:52:09 2013 UTC (10 years, 4 months ago) by jpye

few extra comments

Revision 2704 - Directory Listing
Modified Mon May 27 06:45:23 2013 UTC (10 years, 4 months ago) by jpye

Pipe model including emissivity and convection losses added.
Note that the model doesn't include calculation of viscosity for friction equation.

Revision 2703 - Directory Listing
Modified Tue May 21 23:47:04 2013 UTC (10 years, 4 months ago) by jpye

add friction factor to model (no calc of viscosity yet)

Revision 2702 - Directory Listing
Modified Wed May 15 04:03:22 2013 UTC (10 years, 4 months ago) by jpye

Simple model of adiabatic pipe with FPROPS.

Revision 2698 - Directory Listing
Modified Wed Mar 13 23:24:23 2013 UTC (10 years, 6 months ago) by jpye

Trying to merge cycle_plot_rachel.py into cycle_plot.py. 
Some improvements to cycle plot of the brayton_regen and brayton_regen_reheat_intercool cycle plots to include heat exchanger dotted lines.

Revision 2696 - Directory Listing
Modified Thu Mar 7 00:21:44 2013 UTC (10 years, 6 months ago) by jpye

Attempting to sort out brayton_split_salt model. Bug 472 is causing problems here.

Revision 2695 - Directory Listing
Modified Wed Mar 6 23:37:54 2013 UTC (10 years, 6 months ago) by jpye

Add support for 'scons CC=clang' with FPROPS.
Remove unused #defines in ASCEND CUnit test suits

Revision 2693 - Directory Listing
Modified Tue Mar 5 05:23:34 2013 UTC (10 years, 6 months ago) by jpye

Modified test case for bug 564 slightly, now able to access the error via valgrind as well. Valgrind output gives:

solvers/qrslv/qrslv.c:3373 (structural_analysis): In QRSlv, got vused = 219...
==28310== Invalid read of size 8
==28310==    at 0x4EFCF76: CalcResidGivenValue (relation_util.c:4037)
==28310==    by 0x4EFD90C: zbrent (rootfind.c:84)
==28310==    by 0x4EFD235: RootFind (relation_util.c:4120)
==28310==    by 0x4EFAB80: RelationFindRoots (relation_util.c:3210)
==28310==    by 0x4F4C59E: relman_directly_solve_new (relman.c:1039)
==28310==    by 0x4F509D7: slv_direct_solve (slv_common.c:208)
==28310==    by 0x70324C6: qrslv_iterate (qrslv.c:3842)
==28310==    by 0x70336E5: qrslv_solve (qrslv.c:4175)
==28310==    by 0x4F60CB1: slv_solve (solver.c:364)
==28310==    by 0x42F607: test_bug564 (test_qrslv.c:244)
==28310==    by 0x61587A3: run_single_test (TestRun.c:1129)
==28310==    by 0x6156161: CU_run_selected_tests (TestRun.c:473)
==28310==  Address 0x100793d338 is not stack'd, malloc'd or (recently) free'd
==28310== 
==28310== 
==28310== Process terminating with default action of signal 11 (SIGSEGV)
==28310==  Access not within mapped region at address 0x100793D338
==28310==    at 0x4EFCF76: CalcResidGivenValue (relation_util.c:4037)
==28310==    by 0x4EFD90C: zbrent (rootfind.c:84)
==28310==    by 0x4EFD235: RootFind (relation_util.c:4120)
==28310==    by 0x4EFAB80: RelationFindRoots (relation_util.c:3210)
==28310==    by 0x4F4C59E: relman_directly_solve_new (relman.c:1039)
==28310==    by 0x4F509D7: slv_direct_solve (slv_common.c:208)
==28310==    by 0x70324C6: qrslv_iterate (qrslv.c:3842)
==28310==    by 0x70336E5: qrslv_solve (qrslv.c:4175)
==28310==    by 0x4F60CB1: slv_solve (solver.c:364)
==28310==    by 0x42F607: test_bug564 (test_qrslv.c:244)
==28310==    by 0x61587A3: run_single_test (TestRun.c:1129)
==28310==    by 0x6156161: CU_run_selected_tests (TestRun.c:473)
==28310==  If you believe this happened as a result of a stack
==28310==  overflow in your program's main thread (unlikely but
==28310==  possible), you can try to increase the size of the
==28310==  main thread stack using the --main-stacksize= flag.
==28310==  The main thread stack size used in this run was 8388608.
==28310==

Revision 2692 - Directory Listing
Modified Tue Mar 5 04:45:27 2013 UTC (10 years, 6 months ago) by jpye

Fix rankine_regen_water model (some initialisation had been omitted).
Update plotting routine for rankine_regen_water.

Revision 2691 - Directory Listing
Modified Tue Mar 5 03:13:14 2013 UTC (10 years, 6 months ago) by jpye

Few repairs to brayton_splot.a4c and dependencies.
Fixed up error reporting for unassigned integer_constant in check.c.
Removed debug output in heatex_pinch.

Revision 2689 - Directory Listing
Modified Mon Mar 4 11:28:19 2013 UTC (10 years, 6 months ago) by jpye

Fixes bug 567, for the moment. More tests surely required.

Revision 2686 - Directory Listing
Modified Wed Feb 27 02:08:53 2013 UTC (10 years, 6 months ago) by saheb

Merging saheb-canvas work from Saheb in GSOC2012 into trunk (from saheb-merge branch at changeset 4445). Some minor changes needed. -- jpye.

Revision 2685 - Directory Listing
Modified Tue Feb 26 02:53:19 2013 UTC (10 years, 6 months ago) by jpye

Remove reference to 'libfprops', build external relations without library dependencies (for now).

Revision 2683 - Directory Listing
Modified Fri Feb 22 01:31:37 2013 UTC (10 years, 7 months ago) by jpye

Some updates on ascend.spec from Antonio Trande.

Revision 2682 - Directory Listing
Modified Thu Jan 31 00:41:15 2013 UTC (10 years, 7 months ago) by jpye

Working on better/faster (p,h) test suite.

Revision 2681 - Directory Listing
Modified Mon Jan 28 12:15:15 2013 UTC (10 years, 7 months ago) by jpye

Working on destructors for RunData, works from C, but not yet from Python.

Revision 2680 - Directory Listing
Modified Mon Jan 28 06:30:25 2013 UTC (10 years, 7 months ago) by jpye

Working on problem with solve_ph. Could be that one of the deriv routines is wrong in the saturation region?

Revision 2679 - Directory Listing
Modified Mon Jan 28 03:41:23 2013 UTC (10 years, 7 months ago) by jpye

fix test sat1 for n_eicosane above TP.

Revision 2678 - Directory Listing
Modified Mon Jan 28 02:00:37 2013 UTC (10 years, 7 months ago) by jpye

Fix problem with n_eicosane by adding T_t value to _rpp.c. PR saturation properties working now for all fluids for T>0.4*T_c where T_t is missing.

Revision 2677 - Directory Listing
Modified Mon Jan 28 01:40:17 2013 UTC (10 years, 7 months ago) by jpye

Down to one solitary convergence error in saturation property calculation (n_eicosane at low temperature).

Revision 2674 - Directory Listing
Modified Thu Jan 24 02:27:41 2013 UTC (10 years, 8 months ago) by jpye

Brayton cycle models working OK know with new FPROPS.

Revision 2673 - Directory Listing
Modified Thu Jan 24 01:04:47 2013 UTC (10 years, 8 months ago) by jpye

Checking Rankine cycle models with new FPROPS2 code. Some problem with rankine_regen_water.

Revision 2672 - Directory Listing
Modified Thu Jan 24 00:52:22 2013 UTC (10 years, 8 months ago) by jpye

Force use of RPP data in saturation test suite, no failover to Helmholtz data.

Revision 2671 - Directory Listing
Modified Thu Jan 24 00:35:44 2013 UTC (10 years, 8 months ago) by jpye

Added testing of saturation curve for all fluids in their 'best' correlation. Six fluids are showing occasional failures, all of them PR EOS.

Revision 2670 - Directory Listing
Modified Wed Jan 23 05:58:37 2013 UTC (10 years, 8 months ago) by jpye

Add test of saturation curve convergence for all helmholtz fluids.

Revision 2669 - Directory Listing
Modified Wed Jan 23 05:38:50 2013 UTC (10 years, 8 months ago) by jpye

Got problem with convergence of saturation properties of ethanol...

Revision 2668 - Directory Listing
Modified Wed Jan 23 04:57:19 2013 UTC (10 years, 8 months ago) by jpye

Identified problem with low-pressure (p,h) calculations with isohexane.

Revision 2667 - Directory Listing
Modified Mon Jan 21 06:54:33 2013 UTC (10 years, 8 months ago) by jpye

comment out debug file creation

Revision 2666 - Directory Listing
Modified Mon Jan 21 06:25:55 2013 UTC (10 years, 8 months ago) by jpye

Use C99 '_Complex' instead of 'complex'.

Revision 2665 - Directory Listing
Modified Mon Jan 21 06:23:14 2013 UTC (10 years, 8 months ago) by jpye

Cubic root solver was giving problems. Replacing with the one Sean/Ankit had been using.

Revision 2664 - Directory Listing
Modified Fri Jan 18 06:02:15 2013 UTC (10 years, 8 months ago) by jpye

Trying to debug fprops_triple_point for Toluene with pengrob correlation. Something strange is happening with fratio.

Revision 2663 - Directory Listing
Modified Fri Jan 18 01:06:06 2013 UTC (10 years, 8 months ago) by jpye

Revert to not using a 'libfprops.so'.

Revision 2662 - Directory Listing
Modified Fri Jan 18 00:34:51 2013 UTC (10 years, 8 months ago) by jpye

Added some C tests for sat and solve_ph routines.
Added parameter 'source' to fprops_fluid, to allow data with a particular source to be specified (optionally). This allows forced testing explicitly of the RPP data even when Helmholtz data is also available.
Tweaked some convergence parameters in sat.c and solve_ph.c to get convergence across broader range of parameters for more fluids (more testing required).

Revision 2661 - Directory Listing
Modified Thu Jan 17 00:15:12 2013 UTC (10 years, 8 months ago) by jpye

Update GPL header, debugging issue with (p,h) for Water.

Revision 2660 - Directory Listing
Modified Wed Jan 16 05:57:03 2013 UTC (10 years, 8 months ago) by jpye

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 - Directory Listing
Modified Wed Jan 16 03:09:20 2013 UTC (10 years, 8 months ago) by jpye

Change toluene default reference state to REF_TPF, fixes rankine_fprops model. How to specify reference states via the ASCEND wrapper, then?

Revision 2658 - Directory Listing
Modified Wed Jan 16 02:37:20 2013 UTC (10 years, 8 months ago) by jpye

Working on problem with (p,h) solution with new FPROPS code.

Revision 2657 - Directory Listing
Modified Wed Jan 16 02:34:24 2013 UTC (10 years, 8 months ago) by jpye

fix error with undefined type.

Revision 2656 - Directory Listing
Modified Wed Jan 16 02:09:38 2013 UTC (10 years, 8 months ago) by jpye

remove attempt to build MBWR.

Revision 2655 - Directory Listing
Modified Wed Jan 16 02:08:20 2013 UTC (10 years, 8 months ago) by jpye

Fix build with heatex_pinch stuff in FPROPS.

Revision 2654 - Directory Listing
Modified Wed Jan 16 02:04:07 2013 UTC (10 years, 8 months ago) by jpye

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 2651 - Directory Listing
Modified Thu Dec 13 07:29:48 2012 UTC (10 years, 9 months ago) by jpye

Fixing GPL header, removing postal address (rpmlint incorrect-fsf-address)

Revision 2649 - Directory Listing
Modified Wed Dec 12 12:39:25 2012 UTC (10 years, 9 months ago) by jpye

Fixing GPL header, removing postal address (rpmlint incorrect-fsf-address)

Revision 2648 - Directory Listing
Modified Wed Dec 12 06:04:23 2012 UTC (10 years, 9 months ago) by jpye

Fixing GPL header, removing postal address (rpmlint incorrect-fsf-address)

Revision 2642 - Directory Listing
Modified Tue Oct 2 09:31:20 2012 UTC (10 years, 11 months ago) by jpye

separate bug 567 and 564, avoid a name clash, eliminate duplicate FindInsts (Dante Stroe?)

Revision 2639 - Directory Listing
Modified Sun Sep 30 04:22:20 2012 UTC (10 years, 11 months ago) by jpye

Better test for bug 567.

Revision 2638 - Directory Listing
Modified Sun Sep 30 03:37:59 2012 UTC (10 years, 11 months ago) by jpye

working on test case for bug 531, bug 566. latest tests show error in UpdateInputArgsList during sim_destroy.

Revision 2637 - Directory Listing
Modified Sat Sep 29 03:15:34 2012 UTC (10 years, 11 months ago) by jpye

Brayton cycle models, some bugs still need to be sorted out.

Revision 2636 - Directory Listing
Modified Sat Sep 29 01:01:00 2012 UTC (10 years, 11 months ago) by jpye

add label for boiler_simple heat equation, to allow disabling

Revision 2632 - Directory Listing
Modified Wed Aug 8 03:37:15 2012 UTC (11 years, 1 month ago) by jpye

missing file for heatex_pinch.

Revision 2631 - Directory Listing
Modified Wed Aug 8 03:32:55 2012 UTC (11 years, 1 month ago) by jpye

Fixed error in pinch calculation. Seems to be working OK.

Revision 2630 - Directory Listing
Modified Mon Aug 6 13:42:14 2012 UTC (11 years, 1 month ago) by jpye

Trying to split up instantiate.c. A big job actually.

Revision 2481 - Directory Listing
Modified Thu Jun 23 13:42:16 2011 UTC (12 years, 3 months ago) by jpye

Small demo of solve_ph functionality in C.

Revision 2468 - Directory Listing
Modified Fri May 27 06:35:20 2011 UTC (12 years, 4 months ago) by jpye

Fix for current function names

Revision 2467 - Directory Listing
Modified Fri May 27 06:33:38 2011 UTC (12 years, 4 months ago) by jpye

Add 'solve_Tx' function for convenience.
Add 'helmholtz_u_raw' and change 'helmholtz_u' so that it tests for saturation conditions.
Fixed pv.py to use new 'fprops_fluid' function.
Add example of solve_Tx function.
Fix separate build of FPROPS (independent of ASCEND).

Revision 2455 - Directory Listing
Modified Tue Apr 12 08:32:23 2011 UTC (12 years, 5 months ago) by jpye

Added calculation of speed of sound using FPROPS.
Added simple ideal-gas models of isentropic compressible flow and normal shocks (johnpye/compressible_flow.a4c)
Working on adding turbine nozzle calculation and reaction turbine stage models, ongoing (not ready yet!).
Added delta_specific_entropy to thermo_types.a4c.

Revision 2451 - Directory Listing
Modified Wed Apr 6 07:48:52 2011 UTC (12 years, 5 months ago) by jpye

New work towards detailed turbine model. Impulse turbine stage model partly operational, reaction stage still in progress.
Added new {rot} and {RPM} measures of angle and angular speed. But note clash with {rpm} which is cycles per minute (not angle).
Added calculation of c_p and c_v from FPROPS.

Revision 2412 - Directory Listing
Modified Wed Mar 9 05:21:54 2011 UTC (12 years, 6 months ago) by jpye

Fixed valve model to use mass flowrate instead of volume, in accordance with Thomas book.

Revision 2410 - Directory Listing
Modified Mon Mar 7 06:16:51 2011 UTC (12 years, 6 months ago) by jpye

better handling of units for valve coefficient.

Revision 2406 - Directory Listing
Modified Tue Mar 1 06:13:45 2011 UTC (12 years, 6 months ago) by jpye

regularised expressions noted.

Revision 2405 - Directory Listing
Modified Tue Mar 1 06:11:22 2011 UTC (12 years, 6 months ago) by jpye

a solution to the units-of-measurement thing for control valves.

Revision 2404 - Directory Listing
Modified Tue Mar 1 05:09:20 2011 UTC (12 years, 6 months ago) by jpye

Add valve model using FPROPS.

Revision 2327 - Directory Listing
Modified Wed Dec 22 07:17:24 2010 UTC (12 years, 9 months ago) by jpye

Merging in refactor of the C++ code, which is moved out of 'pygtk' and into 'ascxx'.
Adding support for IPOPT 3.9.1, the current latest version.
Support in dtar for parallel builds (possibly needs some testing still).

Revision 2309 - Directory Listing
Modified Fri Sep 3 00:39:33 2010 UTC (13 years ago) by jpye

Fixes for Windows installer, allowing FPROPS to be included.

Revision 2308 - Directory Listing
Modified Thu Sep 2 03:56:14 2010 UTC (13 years ago) by jpye

Turn off FPE in solve_ph.c (otherwise causes problems on Ubuntu 10.04 with rankine_co2 model).

Revision 2307 - Directory Listing
Modified Thu Sep 2 03:36:57 2010 UTC (13 years ago) by jpye

Minor changes to FPROPS cycle models.
Fix 'scons install' to also install FPROPS in Python path in Linux (still need to test install with Windows).

Revision 2305 - Directory Listing
Modified Sun Aug 22 11:22:34 2010 UTC (13 years, 1 month ago) by jpye

Rename 'node' to 'air_node' and 'stream' to 'air_stream' in brayton.a4c.
More plotting routines in cycle_plot.
Finalised combined cycle models including ammonia.
Small bug in nitrogen.c when testing (./test.py nitrogen).

Revision 2304 - Directory Listing
Modified Sun Aug 22 02:33:59 2010 UTC (13 years, 1 month ago) by jpye

Fix bug in regen cycles.

Revision 2303 - Directory Listing
Modified Sun Aug 22 01:33:16 2010 UTC (13 years, 1 month ago) by jpye

Fix minor issue with building FPROPS from ~/ascend.
Added heat-exchanger plopts in cycle_plot.py.
Finished ammonia and toluene regen cycles.

Revision 2302 - Directory Listing
Modified Sat Aug 21 13:50:06 2010 UTC (13 years, 1 month ago) by jpye

Add data table for Tc, pc, Tt, pt etc.
Add model of toluene and water regenerative rankine cycles.

Revision 2301 - Directory Listing
Modified Sat Aug 21 13:28:35 2010 UTC (13 years, 1 month ago) by jpye

Regen toluene model working, next water.

Revision 2300 - Directory Listing
Modified Fri Aug 20 13:50:05 2010 UTC (13 years, 1 month ago) by jpye

Fixing test routine.

Revision 2299 - Directory Listing
Modified Fri Aug 20 06:53:38 2010 UTC (13 years, 1 month ago) by jpye

Automatic generation of the fluids list completed now (hopefully).

Revision 2298 - Directory Listing
Modified Fri Aug 20 05:50:25 2010 UTC (13 years, 1 month ago) by jpye

moving fluids to subdirectory.

Revision 2297 - Directory Listing
Modified Fri Aug 20 05:47:43 2010 UTC (13 years, 1 month ago) by jpye

Working on streamlined system for adding/retrieving fluids.

Revision 2295 - Directory Listing
Modified Mon Aug 16 10:06:22 2010 UTC (13 years, 1 month ago) by jpye

Checking toluene Rankine cycle.

Revision 2294 - Directory Listing
Modified Mon Aug 16 08:52:51 2010 UTC (13 years, 1 month ago) by jpye

Fix basic rankine cycle plot to include condenser curve.

Revision 2293 - Directory Listing
Modified Mon Aug 16 08:46:28 2010 UTC (13 years, 1 month ago) by jpye

sat_T routine returns critical point properties if T is within 1e-8 K of critical point.

Revision 2292 - Directory Listing
Modified Mon Aug 16 08:39:06 2010 UTC (13 years, 1 month ago) by jpye

Added C test code for testing saturation curve (./test.py carbondioxide).

Revision 2291 - Directory Listing
Modified Sun Aug 15 14:13:59 2010 UTC (13 years, 1 month ago) by jpye

Add plotting of p=constant lines on Ts diagram for the power cycles.
Add calculation of heat exchanger effectiveness (faulty!), trying to trap physically impossible heat exchange cases.

Revision 2290 - Directory Listing
Modified Sun Aug 15 10:11:54 2010 UTC (13 years, 1 month ago) by jpye

Trying to catch errors associated with pressure below triple point for CO2.

Revision 2289 - Directory Listing
Modified Sun Aug 15 06:34:28 2010 UTC (13 years, 1 month ago) by jpye

Resolved bug with evaluation at temperatures very very very slightly below triple point.

Revision 2288 - Directory Listing
Modified Sun Aug 15 06:16:13 2010 UTC (13 years, 1 month ago) by jpye

Fixed some more FPE issues with pt->l going off the end of the array!
satcvgc working everywhere now except exactly at sat_p for p=p_t.

Revision 2287 - Directory Listing
Modified Sun Aug 15 01:19:21 2010 UTC (13 years, 1 month ago) by jpye

Trying to track down an error that's started occurring with CO2 saturation curves.

Revision 2286 - Directory Listing
Modified Sat Aug 14 15:05:12 2010 UTC (13 years, 1 month ago) by jpye

Working on plots for combined cycle. Something is broken with CO2 model.

Revision 2285 - Directory Listing
Modified Sat Aug 14 13:47:07 2010 UTC (13 years, 1 month ago) by jpye

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 - Directory Listing
Modified Sat Aug 14 10:52:06 2010 UTC (13 years, 1 month ago) by jpye

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 - Directory Listing
Modified Sat Aug 14 09:30:57 2010 UTC (13 years, 1 month ago) by jpye

Add extra condition in sat.c to allow Akasaka algorithm to converge for toluene.

Revision 2281 - Directory Listing
Modified Sat Aug 14 08:47:16 2010 UTC (13 years, 1 month ago) by jpye

Fixing ignore list, adding couple of short test routines.

Revision 2280 - Directory Listing
Modified Sat Aug 14 08:16:37 2010 UTC (13 years, 1 month ago) by hongke

jpye: Merging r2695:3040 from 'hongke' branch into trunk. Thanks HongKe for all your work!

Revision 2279 - Directory Listing
Modified Sat Aug 14 07:21:51 2010 UTC (13 years, 1 month ago) by jpye

Combined cycle working now with CO2 as the working fluid in the rankine cycle.

Revision 2278 - Directory Listing
Modified Thu Aug 12 05:56:36 2010 UTC (13 years, 1 month ago) by jpye

Combined-cycle model converges with FPROPS! Now it's getting useful :-)

Revision 2277 - Directory Listing
Modified Thu Aug 12 04:39:13 2010 UTC (13 years, 1 month ago) by jpye

remove (v,T) code, rankine models now converge with FPROPS.

Revision 2276 - Directory Listing
Modified Wed Aug 11 14:50:25 2010 UTC (13 years, 1 month ago) by jpye

Basic Rankine model converging using FPROPS. The more complex models are not yet converging.

Revision 2275 - Directory Listing
Modified Wed Aug 11 13:58:25 2010 UTC (13 years, 1 month ago) by jpye

Fixing error return from asc_helmholtz function.
The bug with 'defaultall' functionality is still here... see boiler_simple_test mode in models/johnpye/fprops/rankine_fprops.a4c.

Revision 2274 - Directory Listing
Modified Wed Aug 11 11:23:30 2010 UTC (13 years, 1 month ago) by jpye

adding ph mode to stream_state_test.

Revision 2272 - Directory Listing
Modified Sun Aug 8 23:15:10 2010 UTC (13 years, 1 month ago) by jpye

Add fprops_Tvsh_ph to asc_helmholtz for calculation in terms of (p,h). The
routine does not seem to work particularly well though.

Revision 2271 - Directory Listing
Modified Sun Aug 8 12:17:00 2010 UTC (13 years, 1 month ago) by jpye

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 2270 - Directory Listing
Modified Sun Aug 8 09:07:43 2010 UTC (13 years, 1 month ago) by jpye

Seem to have fixed the solve_ph problems, but new problems in fprops_sat_p have arisen.

Revision 2269 - Directory Listing
Modified Sun Aug 8 05:40:41 2010 UTC (13 years, 1 month ago) by jpye

Avoid stepping outside saturation region in fprops_sat_hf.

Revision 2268 - Directory Listing
Modified Fri Aug 6 07:31:35 2010 UTC (13 years, 1 month ago) by jpye

Improved first guess has eliminated many of the errors, still problems though.

Revision 2267 - Directory Listing
Modified Fri Aug 6 00:54:48 2010 UTC (13 years, 1 month ago) by jpye

Adding better starting guess for T,rho when solving (p,h) in compressed subcritical liquid region.

Revision 2266 - Directory Listing
Modified Thu Aug 5 13:53:01 2010 UTC (13 years, 1 month ago) by jpye

The (p,h) function is converging almost everywhere. The home-made Newton iteration wasn't starting well for supercritical states
when the starting guess had rho = rho_c, so changing slightly away from fixed almost all the problems.

Revision 2265 - Directory Listing
Modified Thu Aug 5 12:04:22 2010 UTC (13 years, 1 month ago) by jpye

cleaning up couple of compiler warnings.

Revision 2264 - Directory Listing
Modified Thu Aug 5 09:25:55 2010 UTC (13 years, 1 month ago) by jpye

A basic fprops_sat_p function working now.
Need to add p_t, T_t data to all materials.

Revision 2263 - Directory Listing
Modified Thu Aug 5 08:42:30 2010 UTC (13 years, 1 month ago) by jpye

Removing these; code was moved into sat.[ch].

Revision 2262 - Directory Listing
Modified Thu Aug 5 08:34:43 2010 UTC (13 years, 1 month ago) by jpye

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 - Directory Listing
Modified Thu Aug 5 07:41:31 2010 UTC (13 years, 1 month ago) by jpye

First attempt at Akasaka algorithm. But something's badly broken in the test suite, need to go find what.

Revision 2260 - Directory Listing
Modified Thu Aug 5 06:28:01 2010 UTC (13 years, 1 month ago) by jpye

Error messages to detect temperatures below critical point.

Revision 2259 - Directory Listing
Modified Thu Aug 5 03:37:14 2010 UTC (13 years, 1 month ago) by jpye

Working on convergence of (p,h) over wide range.

Revision 2258 - Directory Listing
Modified Wed Aug 4 11:41:45 2010 UTC (13 years, 1 month ago) by jpye

Debugging nan in f1 in helm_resid_deldel.

Revision 2257 - Directory Listing
Modified Wed Aug 4 09:45:52 2010 UTC (13 years, 1 month ago) by jpye

Converging in supercritical region now.
Fixed some nan errors in helmholtz, needs cleaning up.

Revision 2256 - Directory Listing
Modified Wed Aug 4 08:33:48 2010 UTC (13 years, 1 month ago) by jpye

Converging... for one little case at least.

Revision 2255 - Directory Listing
Modified Wed Aug 4 04:43:18 2010 UTC (13 years, 1 month ago) by jpye

Adding bespoke (p,h) iteration code, but looks like some errors with the partial derivatives.

Revision 2254 - Directory Listing
Modified Wed Aug 4 02:56:52 2010 UTC (13 years, 1 month ago) by jpye

For some reason the fdfsolver is not varying the guess values...

Revision 2253 - Directory Listing
Modified Wed Aug 4 00:14:19 2010 UTC (13 years, 1 month ago) by jpye

Cleaning up syntax of some derivs.h calls; working towards getting nonsolver working.

Revision 2252 - Directory Listing
Modified Tue Aug 3 14:30:53 2010 UTC (13 years, 1 month ago) by jpye

Fixed solve_ph for saturation region.
Still not implemented 'nonsolver' for non-saturation cases.

Revision 2251 - Directory Listing
Modified Tue Aug 3 14:12:37 2010 UTC (13 years, 1 month ago) by jpye

Added binding for solve_ph, but code is not yet completed.

Revision 2250 - Directory Listing
Modified Tue Aug 3 13:56:52 2010 UTC (13 years, 1 month ago) by jpye

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 2249 - Directory Listing
Modified Tue Aug 3 12:03:12 2010 UTC (13 years, 1 month ago) by jpye

Trying to add Tsat(p) routine to FPROPS.

Revision 2248 - Directory Listing
Modified Tue Aug 3 08:48:59 2010 UTC (13 years, 1 month ago) by jpye

More work on adding (p,h) solver in FPROPS.

Revision 2247 - Directory Listing
Modified Tue Aug 3 07:51:40 2010 UTC (13 years, 1 month ago) by jpye

Some work towards (p,h) solver and derivatives function for FPROPS.

Revision 2246 - Directory Listing
Modified Mon Aug 2 05:47:27 2010 UTC (13 years, 1 month ago) by jpye

Added *calculated* values of p_c to data, fixes problems with satcvgc.py for most cases.

Revision 2243 - Directory Listing
Modified Sun Aug 1 23:18:55 2010 UTC (13 years, 1 month ago) by jpye

Adding support for changeble fluid in rankine_fprops models.
Ammonia saturation line is OK now, was just missing p_c value.
Problem case added in phsx_test.

Revision 2237 - Directory Listing
Modified Fri Jul 30 01:04:49 2010 UTC (13 years, 1 month ago) by jpye

Add simple Rankine cycle model using FPROPS for steam calculation.

Revision 2236 - Directory Listing
Modified Thu Jul 29 13:51:34 2010 UTC (13 years, 1 month ago) by jpye

Initial model with support for saturation calculation with FPROPS. More debugging required.

Revision 2235 - Directory Listing
Modified Thu Jul 29 08:45:54 2010 UTC (13 years, 1 month ago) by jpye

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 2234 - Directory Listing
Modified Thu Jul 29 04:07:26 2010 UTC (13 years, 1 month ago) by jpye

Added second derivative to spinodal plot. Looks like bugs with d2pdrho2 still.

Revision 2233 - Directory Listing
Modified Wed Jul 28 09:09:11 2010 UTC (13 years, 2 months ago) by jpye

helm_resid_deldeldel implementation complete... now for testing.

Revision 2232 - Directory Listing
Modified Wed Jul 28 09:02:51 2010 UTC (13 years, 2 months ago) by jpye

working towards implementing helm_resid_deldeldel

Revision 2231 - Directory Listing
Modified Tue Jul 27 09:07:35 2010 UTC (13 years, 2 months ago) by jpye

Adding helm_resid_deldeldel function, in progress.

Revision 2230 - Directory Listing
Modified Tue Jul 27 01:56:55 2010 UTC (13 years, 2 months ago) by jpye

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 2229 - Directory Listing
Modified Mon Jul 26 13:29:14 2010 UTC (13 years, 2 months ago) by jpye

Add error count.

Revision 2228 - Directory Listing
Modified Mon Jul 26 13:20:51 2010 UTC (13 years, 2 months ago) by jpye

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 2227 - Directory Listing
Modified Mon Jul 26 08:40:51 2010 UTC (13 years, 2 months ago) by jpye

update plot to shot unconverged points.

Revision 2226 - Directory Listing
Modified Mon Jul 26 03:42:34 2010 UTC (13 years, 2 months ago) by jpye

Plot error values as well.

Revision 2225 - Directory Listing
Modified Mon Jul 26 03:40:18 2010 UTC (13 years, 2 months ago) by jpye

Added python bindings for new function. 
We can see that it's not converging for about 10% of cases.

Revision 2224 - Directory Listing
Modified Mon Jul 26 01:14:48 2010 UTC (13 years, 2 months ago) by jpye

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 - Directory Listing
Modified Sun Jul 25 23:58:36 2010 UTC (13 years, 2 months ago) by jpye

correct to Helmholtz energy, instead of Gibbs, according IAPWS95 release.

Revision 2222 - Directory Listing
Modified Sun Jul 25 14:45:45 2010 UTC (13 years, 2 months ago) by jpye

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 2218 - Directory Listing
Modified Tue Jul 20 07:30:48 2010 UTC (13 years, 2 months ago) by jpye

Playing around with temperature limits.

Revision 2215 - Directory Listing
Modified Mon Jul 12 23:11:29 2010 UTC (13 years, 2 months ago) by jpye

Copying HongKe's methane correlation to trunk (pending testing?) and fixing helmholtz_g as suggested by Shrikantch (also needs double-checking).
Fixed problem with GSL in fprops/SConstruct.

Revision 2150 - Directory Listing
Modified Tue Feb 16 06:08:57 2010 UTC (13 years, 7 months ago) by mahesh

Bump trunk to 0.9.8.
Some work on detection of SUNDIALS on Linux (will need to be reviewed on Windows).
Update DistTar for smoother building of tarball, less stray deps.

Revision 2149 - Directory Listing
Modified Fri Jan 22 20:20:33 2010 UTC (13 years, 8 months ago) by kchittur

Revision 2147 - Directory Listing
Modified Fri Jan 22 04:15:50 2010 UTC (13 years, 8 months ago) by kchittur

Revision 2125 - Directory Listing
Modified Tue Dec 15 08:35:38 2009 UTC (13 years, 9 months ago) by jpye

Test file for solving phase criterion using QRSlv (no success yet).

Revision 2124 - Directory Listing
Modified Tue Dec 15 08:34:56 2009 UTC (13 years, 9 months ago) by jpye

Various efforts at implementing Maxwell phase criterion, nothing working yet.

Revision 2123 - Directory Listing
Modified Mon Dec 14 08:14:44 2009 UTC (13 years, 9 months ago) by jpye

Switched to derivative-free method, more luck with convergence but wrong result still.

Revision 2122 - Directory Listing
Modified Mon Dec 14 07:47:41 2009 UTC (13 years, 9 months ago) by jpye

Attempt at implementing solver for saturation state using GSL fdfsolver.

Revision 2121 - Directory Listing
Modified Sun Dec 13 23:58:51 2009 UTC (13 years, 9 months ago) by jpye

Fixed bug in Chouaieb vapour density calc.

Revision 2120 - Directory Listing
Modified Thu Dec 10 23:08:15 2009 UTC (13 years, 9 months ago) by jpye

Fix build of SharedObject.
Put Chouaieb and Rackett models in separate functions.

Revision 2119 - Directory Listing
Modified Wed Dec 9 08:40:36 2009 UTC (13 years, 9 months ago) by jpye

Add helmholtz_g (Gibbs energy, needs testing).
Working on adding Chouaieb estimate of vapour density, ongoing.

Revision 2118 - Directory Listing
Modified Wed Dec 9 05:00:17 2009 UTC (13 years, 9 months ago) by jpye

Fix build for Linux.

Revision 2117 - Directory Listing
Modified Wed Dec 9 04:30:18 2009 UTC (13 years, 9 months ago) by jpye

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 2116 - Directory Listing
Modified Wed Dec 9 01:34:31 2009 UTC (13 years, 9 months ago) by jpye

Trying out some numerics for saturation curve.

Revision 2115 - Directory Listing
Modified Tue Dec 8 23:55:10 2009 UTC (13 years, 9 months ago) by jpye

Add code to evaluate phase criterion (not solving yet).

Revision 2114 - Directory Listing
Modified Tue Dec 8 08:08:00 2009 UTC (13 years, 9 months ago) by jpye

Starting some more work on saturation curves.

Revision 2113 - Directory Listing
Modified Tue Dec 8 03:37:27 2009 UTC (13 years, 9 months ago) by jpye

Update copyright info. Add citation for CO2.

Revision 2112 - Directory Listing
Modified Tue Dec 8 03:13:39 2009 UTC (13 years, 9 months ago) by jpye

Fixing for new test.h fn sig.

Revision 2111 - Directory Listing
Modified Tue Dec 8 03:05:36 2009 UTC (13 years, 9 months ago) by jpye

CO2 correlation looks to be working now.
Work on support for SUNDIALS on Windows.

Revision 2110 - Directory Listing
Modified Mon Dec 7 04:13:05 2009 UTC (13 years, 9 months ago) by jpye

Still working on CO2 bugs.

Revision 2109 - Directory Listing
Modified Mon Dec 7 01:53:33 2009 UTC (13 years, 9 months ago) by jpye

Fixed problem with CO2 pressure calc. Still need to fix c,m for enthalpy & entropy.

Revision 2108 - Directory Listing
Modified Sun Dec 6 08:35:27 2009 UTC (13 years, 9 months ago) by jpye

Fixed error in CO2 cp0 expr.

Revision 2107 - Directory Listing
Modified Fri Dec 4 06:25:16 2009 UTC (13 years, 9 months ago) by jpye

More work on the carbon dioxide coefficients.

Revision 2106 - Directory Listing
Modified Thu Dec 3 08:29:21 2009 UTC (13 years, 9 months ago) by jpye

Starting on CO2 properties from paper by Span and Wagner.

Revision 2018 - Directory Listing
Modified Wed Apr 29 03:38:10 2009 UTC (14 years, 4 months ago) by jpye

Fixed compile for new header file locations <ascend/compiler/xxx.h> etc.

Revision 2007 - Directory Listing
Modified Mon Apr 27 06:09:29 2009 UTC (14 years, 5 months ago) by jpye

Break ASCEND into dev package and main package.
Fix up gtksourceview syntax rules, add more keywords, remove C cruft.
Add tools/scons/ascend.py tool for detecting ASCEND when building software using SCons.
DTAR now fails if dpkg-buildpackage fails, keeps temp files hanging around for inspection.
Plots generated by 'plot.a4l' no longer add legend if no labels specified.
Committing python bindings for FPROPS. Much testing remains to be done there.

Revision 1997 - Directory Listing
Modified Wed Feb 18 22:32:16 2009 UTC (14 years, 7 months ago) by jpye

Commenting out fprintfs in helmholtz.c so that ASCEND extfn can build.
Revert canvas to Gaphas zoomtool.

Revision 1996 - Directory Listing
Modified Thu Feb 5 09:42:42 2009 UTC (14 years, 7 months ago) by jpye

Added acentric factor to HelmholtzData.
Working on adding calculation of saturation curve using Maxwell phase-equilibrium condition (per IAPWS95).

Revision 1995 - Directory Listing
Modified Wed Feb 4 13:20:31 2009 UTC (14 years, 7 months ago) by jpye

Add support for hydrogen, water in ASCEND.

Revision 1994 - Directory Listing
Modified Wed Feb 4 03:52:36 2009 UTC (14 years, 7 months ago) by jpye

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 1993 - Directory Listing
Modified Tue Feb 3 23:52:53 2009 UTC (14 years, 7 months ago) by jpye

Normalising code for critical terms; still a bug with calculation of helmholtz_w in critical region.

Revision 1990 - Directory Listing
Modified Tue Feb 3 11:12:40 2009 UTC (14 years, 7 months ago) by jpye

Added critical terms to helm_resid_deldel and helm_resid_deltau.
Tests are still not passing though, need to check for errors.

Revision 1989 - Directory Listing
Modified Tue Feb 3 07:29:29 2009 UTC (14 years, 7 months ago) by jpye

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 - Directory Listing
Modified Tue Feb 3 05:38:33 2009 UTC (14 years, 7 months ago) by jpye

Added critical terms to helm_resid_tautau.
Tests for water for cv pass.

Revision 1987 - Directory Listing
Modified Tue Feb 3 05:25:49 2009 UTC (14 years, 7 months ago) by jpye

Added evaluation of helm_resid_tau, gives correct values for entropy with water.

Revision 1986 - Directory Listing
Modified Tue Feb 3 05:19:15 2009 UTC (14 years, 7 months ago) by jpye

Fixed helm_resid and helm_resid_del with critical terms.

Revision 1985 - Directory Listing
Modified Tue Feb 3 01:15:17 2009 UTC (14 years, 7 months ago) by jpye

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 1928 - Directory Listing
Modified Wed Oct 8 23:05:53 2008 UTC (14 years, 11 months ago) by jpye

Added Wiki link.

Revision 1923 - Directory Listing
Modified Fri Oct 3 07:30:04 2008 UTC (14 years, 11 months ago) by jpye

Added derivatives for u in ASCEND hooks.

Revision 1922 - Directory Listing
Modified Fri Oct 3 07:09:15 2008 UTC (14 years, 11 months ago) by jpye

Checked u,h derivatives with ammonia, nitrogen, hydrogen, all appear to be OK
and match finite difference estimates.

Revision 1921 - Directory Listing
Modified Fri Oct 3 07:06:12 2008 UTC (14 years, 11 months ago) by jpye

Fixed (du/drho)_T

Revision 1920 - Directory Listing
Modified Fri Oct 3 07:02:27 2008 UTC (14 years, 11 months ago) by jpye

Fixed bug with du/dT and dh/dT.

Revision 1919 - Directory Listing
Modified Fri Oct 3 05:52:22 2008 UTC (14 years, 11 months ago) by jpye

Implemented (dh/drho)_T

Revision 1918 - Directory Listing
Modified Fri Oct 3 05:13:08 2008 UTC (14 years, 11 months ago) by jpye

Fixed problem with dh/dT_rho.

Revision 1917 - Directory Listing
Modified Fri Oct 3 04:36:44 2008 UTC (14 years, 11 months ago) by jpye

Fixed most of the problem with dh/dT_rho, still not right.

Revision 1916 - Directory Listing
Modified Thu Oct 2 08:52:46 2008 UTC (14 years, 11 months ago) by jpye

Added dhdT_rho test, currently failing.

Revision 1915 - Directory Listing
Modified Thu Oct 2 08:49:17 2008 UTC (14 years, 11 months ago) by jpye

Adding calculation of derivatives of h.

Revision 1909 - Directory Listing
Modified Sun Sep 28 07:41:24 2008 UTC (14 years, 11 months ago) by jpye

The helmholtz_p function now provides its own derivatives to ASCEND.
Restored full test suite for Hydrogen.

Revision 1908 - Directory Listing
Modified Sat Sep 27 11:52:27 2008 UTC (15 years ago) by jpye

helm_resid_deldel working now, dpdrho_T fixed. Need to wire in with ASCEND now.

Revision 1907 - Directory Listing
Modified Sat Sep 27 09:45:06 2008 UTC (15 years ago) by jpye

Working on dpdrho_T, still looks like problems with Gaussian terms.

Revision 1906 - Directory Listing
Modified Sat Sep 27 08:56:29 2008 UTC (15 years ago) by jpye

Fixed initialisation error in helm_resid_deltau.

Revision 1905 - Directory Listing
Modified Sat Sep 27 04:54:12 2008 UTC (15 years ago) by jpye

Calculated (dp/dT)_rho, seems to look OK when testing with hydrogen.

Revision 1904 - Directory Listing
Modified Sat Sep 27 03:32:21 2008 UTC (15 years ago) by jpye

Removed redundant HelmholtzExpTerm, and corrected nitrogen.c to use
HelmholtzGausTerm instead.

Revision 1903 - Directory Listing
Modified Thu Sep 25 08:47:22 2008 UTC (15 years ago) by jpye

Expanded the ASCEND interface for fprops to include p,u,s,h,a.

Revision 1901 - Directory Listing
Modified Thu Sep 25 07:40:47 2008 UTC (15 years ago) by jpye

Completed hydrogen, passes tests for h,u,s,p,a to high accuracy.

Revision 1900 - Directory Listing
Modified Thu Sep 25 07:34:56 2008 UTC (15 years ago) by jpye

fixed helm_resid_tau for calculation of gaussian terms.

Revision 1899 - Directory Listing
Modified Thu Sep 25 07:31:56 2008 UTC (15 years ago) by jpye

Fixed hydrogen for helmholtz_p (there was a typo in the power term coeffs!)

Revision 1898 - Directory Listing
Modified Thu Sep 25 07:01:05 2008 UTC (15 years ago) by jpye

Debugging hydrogen, checked helm_resid_del values against spread, seem OK...

Revision 1897 - Directory Listing
Modified Thu Sep 25 03:46:29 2008 UTC (15 years ago) by jpye

Fixed small bug in helm_resid_tau, but still not correct.

Revision 1891 - Directory Listing
Modified Tue Sep 23 06:46:28 2008 UTC (15 years ago) by jpye

Fixed bug in helm_resid_tau for gaussian terms.

Revision 1890 - Directory Listing
Modified Mon Sep 22 11:05:46 2008 UTC (15 years ago) by jpye

Note about wrong functions (needing rewrite).

Revision 1889 - Directory Listing
Modified Mon Sep 22 10:19:52 2008 UTC (15 years ago) by jpye

Fixed little error with nitrogen after last changes.

Revision 1888 - Directory Listing
Modified Mon Sep 22 10:09:48 2008 UTC (15 years ago) by jpye

Added correlations for hydrogen (from thesis of Jacob Leachman).

Revision 1887 - Directory Listing
Modified Mon Sep 22 10:05:27 2008 UTC (15 years ago) by jpye

Working on debugging gaussian terms.

Revision 1886 - Directory Listing
Modified Fri Sep 19 07:22:54 2008 UTC (15 years ago) by jpye

Adding separate file with basic test routine.

Revision 1885 - Directory Listing
Modified Fri Sep 19 04:46:18 2008 UTC (15 years ago) by jpye

Starting work on data structures for 'critical terms' as used in water and hydrogen correlations.

Revision 1884 - Directory Listing
Modified Thu Sep 18 13:51:59 2008 UTC (15 years ago) by jpye

Add missing term for phi0 for nitrogen.

Revision 1883 - Directory Listing
Modified Thu Sep 18 13:50:28 2008 UTC (15 years ago) by jpye

All tests for ammonia pass to within 5.5% (h, u, s, a, p).
Remaining error needs further investigation; it looks that REFPROP's cp0 is not agreeing with Tillner-Roth
but this needs to be double-checked.

Revision 1882 - Directory Listing
Modified Thu Sep 18 13:33:46 2008 UTC (15 years ago) by jpye

Nitrogen passes all tests now: p, u, h, s, a.

Revision 1881 - Directory Listing
Modified Thu Sep 18 13:10:28 2008 UTC (15 years ago) by jpye

helm_ideal_tau seems to agree now.

Revision 1880 - Directory Listing
Modified Thu Sep 18 10:39:18 2008 UTC (15 years ago) by jpye

Apparently a problem in helm_ideal_tau with exponential terms?

Revision 1879 - Directory Listing
Modified Thu Sep 18 10:19:06 2008 UTC (15 years ago) by jpye

helm_ideal checked against 'simple' function for comparison.

Revision 1878 - Directory Listing
Modified Thu Sep 18 05:39:04 2008 UTC (15 years ago) by jpye

Added precalc.c, used by precalc.py for preparing cp0 coefficients from phi0.

Revision 1877 - Directory Listing
Modified Thu Sep 18 05:38:37 2008 UTC (15 years ago) by jpye

Reverted ammonia cp0 coefficients to calculated values, rather than hacky curvefit values.

Revision 1876 - Directory Listing
Modified Thu Sep 18 04:31:12 2008 UTC (15 years ago) by jpye

Add README for fprops.

Revision 1875 - Directory Listing
Modified Thu Sep 18 04:30:49 2008 UTC (15 years ago) by jpye

Fixed water helm_ideal calculation.

Revision 1874 - Directory Listing
Modified Thu Sep 18 04:27:16 2008 UTC (15 years ago) by jpye

Added some GPL headers, fixing water helm_ideal coefficients.

Revision 1873 - Directory Listing
Modified Thu Sep 18 02:34:54 2008 UTC (15 years ago) by jpye

Adding water to fluids set (for the purpose of debuggin using freesteam code).

Revision 1872 - Directory Listing
Modified Wed Sep 17 08:18:41 2008 UTC (15 years ago) by jpye

Worked out that errors in helmholtz_a are linear in T... what to do?

Revision 1871 - Directory Listing
Modified Wed Sep 17 07:36:27 2008 UTC (15 years ago) by jpye

More accurate value of the linear constant gives better agreement of h, u for nitrogen.

Revision 1870 - Directory Listing
Modified Wed Sep 17 06:45:10 2008 UTC (15 years ago) by jpye

Fixed error in helmholtz_a.

Revision 1868 - Directory Listing
Modified Wed Sep 17 06:37:45 2008 UTC (15 years ago) by jpye

More debugging

Revision 1867 - Directory Listing
Modified Mon Sep 15 14:30:49 2008 UTC (15 years ago) by jpye

helm_resid seems to agree with spreadsheet now,
still perhaps probs with helm_ideal.

Revision 1866 - Directory Listing
Modified Mon Sep 15 08:44:11 2008 UTC (15 years ago) by jpye

Nitrogen test spreadsheet.

Revision 1865 - Directory Listing
Modified Mon Sep 15 08:40:14 2008 UTC (15 years ago) by jpye

Still working on fixing helmholtz_a.

Revision 1864 - Directory Listing
Modified Mon Sep 15 03:36:16 2008 UTC (15 years ago) by jpye

working on debugging helmholtz_a.

Revision 1863 - Directory Listing
Modified Mon Sep 15 03:12:29 2008 UTC (15 years ago) by jpye

Added tests for Helmholtz energy, still failing.

Revision 1862 - Directory Listing
Modified Sun Sep 14 08:39:51 2008 UTC (15 years ago) by jpye

Remove stderr from default build.

Revision 1861 - Directory Listing
Modified Sun Sep 14 08:37:50 2008 UTC (15 years ago) by jpye

Fix offsets for u, h.
Still need to fix entropy routines.

Revision 1860 - Directory Listing
Modified Sun Sep 14 08:00:29 2008 UTC (15 years ago) by jpye

Comments about difference in cp0.

Revision 1859 - Directory Listing
Modified Sun Sep 14 07:22:39 2008 UTC (15 years ago) by jpye

Fixed error in helm_ideal_tau formula.

Revision 1857 - Directory Listing
Modified Thu Sep 11 14:46:51 2008 UTC (15 years ago) by jpye

p, u, h working for nitrogen, still problems with s.

Revision 1856 - Directory Listing
Modified Thu Sep 11 14:19:26 2008 UTC (15 years ago) by jpye

Maxima macros for ideal gas relations.

Revision 1855 - Directory Listing
Modified Thu Sep 11 13:50:55 2008 UTC (15 years ago) by jpye

Fixed evaluation of cp0 for both ammonia and nitrogen now.

Revision 1851 - Directory Listing
Modified Wed Sep 10 09:17:43 2008 UTC (15 years ago) by jpye

Fixed up some warnings for non-test mode.

Revision 1850 - Directory Listing
Modified Tue Sep 2 06:56:47 2008 UTC (15 years ago) by jpye

Added ideal cp0 values to test data and added
calculation function for this. Works for nitrogen 
but not for ammonia.

Revision 1849 - Directory Listing
Modified Mon Sep 1 14:48:55 2008 UTC (15 years ago) by jpye

Working on fixing the ideal component curves so that they calculate
directly from the cp0(T) form. Currently broken.

Revision 1848 - Directory Listing
Modified Mon Sep 1 13:12:41 2008 UTC (15 years ago) by jpye

Add 'ideal.c' to the compile lists.

Revision 1847 - Directory Listing
Modified Mon Sep 1 05:42:21 2008 UTC (15 years ago) by jpye

Split out ideal curves from helmholtz.c.

Revision 1846 - Directory Listing
Modified Mon Sep 1 04:59:03 2008 UTC (15 years ago) by jpye

Add more to validation spreadsheet.

Revision 1845 - Directory Listing
Modified Sat Aug 30 15:02:45 2008 UTC (15 years ago) by jpye

Working on helmholtz_h with nitrogen.

Revision 1844 - Directory Listing
Modified Sat Aug 30 07:33:11 2008 UTC (15 years ago) by jpye

Cleaned up helmholtz_resid_del, seems to be fixed now.

Revision 1843 - Directory Listing
Modified Fri Aug 29 07:29:55 2008 UTC (15 years ago) by jpye

Add validation spreadsheet.

Revision 1842 - Directory Listing
Modified Fri Aug 29 07:28:47 2008 UTC (15 years ago) by jpye

tighter nitrogen error tolerance for helmholtz_p.

Revision 1841 - Directory Listing
Modified Fri Aug 29 07:27:59 2008 UTC (15 years ago) by jpye

Fixed calculation of nitrogen helmholtz_p.

Revision 1840 - Directory Listing
Modified Fri Aug 29 03:52:04 2008 UTC (15 years ago) by jpye

Fixed test data for ammonia p,h,s: agreement to 0.09% for all values.

Revision 1839 - Directory Listing
Modified Thu Aug 28 09:20:11 2008 UTC (15 years, 1 month ago) by jpye

Getting closer with nitrogen test data.

Revision 1838 - Directory Listing
Modified Thu Aug 28 08:32:29 2008 UTC (15 years, 1 month ago) by jpye

Added 'exponential' terms for nitrogen correlation (still testing).

Revision 1836 - Directory Listing
Modified Mon Aug 25 08:32:38 2008 UTC (15 years, 1 month ago) by jpye

Fixed helm_resid and helm_resid_tau.

Revision 1835 - Directory Listing
Modified Mon Aug 25 08:18:23 2008 UTC (15 years, 1 month ago) by jpye

Checked in generalised version of ideal gas component.
Working on adding the 'exponential' term for the Nitrogen correlation.

Revision 1834 - Directory Listing
Modified Fri Aug 22 08:48:51 2008 UTC (15 years, 1 month ago) by jpye

Adding nitrogen properties (ongoing)

Revision 1833 - Directory Listing
Modified Fri Aug 22 07:26:09 2008 UTC (15 years, 1 month ago) by jpye

Converted ammonia data and tests into a separate file.

Revision 1832 - Directory Listing
Modified Fri Aug 22 07:23:58 2008 UTC (15 years, 1 month ago) by jpye

Refactor helm_resid_tau.

Revision 1831 - Directory Listing
Modified Fri Aug 22 05:54:53 2008 UTC (15 years, 1 month ago) by jpye

Fix copyright date.

Revision 1830 - Directory Listing
Modified Fri Aug 22 05:54:04 2008 UTC (15 years, 1 month ago) by jpye

All tests pass to max error 2.0% (errors for low temperature liquids)

Revision 1829 - Directory Listing
Modified Fri Aug 22 05:00:53 2008 UTC (15 years, 1 month ago) by jpye

Added entropy relation and tests. All entropy tests pass to within 0.03%.

Revision 1828 - Directory Listing
Modified Fri Aug 22 00:48:31 2008 UTC (15 years, 1 month ago) by jpye

Fixed some problems with helmholtz_h.

Revision 1827 - Directory Listing
Modified Thu Aug 21 09:36:00 2008 UTC (15 years, 1 month ago) by jpye

Test cases for helmholtz_p now passing, need to fix helmholtz_u.

Revision 1826 - Directory Listing
Modified Thu Aug 21 08:32:33 2008 UTC (15 years, 1 month ago) by jpye

Fixed: tests for pressure relation are working now.

Revision 1825 - Directory Listing
Modified Thu Aug 21 05:03:19 2008 UTC (15 years, 1 month ago) by jpye

Added functions for enthalpy and internal energy.
Test suites still needed!

Revision 1824 - Directory Listing
Modified Thu Aug 21 02:28:32 2008 UTC (15 years, 1 month ago) by jpye

Added helmholtz_u and helmholtz_h, still require testing.

Revision 1823 - Directory Listing
Modified Wed Aug 20 11:05:05 2008 UTC (15 years, 1 month ago) by jpye

Testing of ammonia p(rho,T) relation.

Revision 1822 - Directory Listing
Modified Wed Aug 20 09:06:39 2008 UTC (15 years, 1 month ago) by jpye

More on helmholtz functions.

Revision 1811 - Directory Listing
Modified Wed Jul 30 05:26:50 2008 UTC (15 years, 1 month ago) by jpye

Added on_load method to test model.
Added simple SConstruct to demonstrate building library independently.

Revision 1810 - Directory Listing
Added Tue Jul 29 07:45:48 2008 UTC (15 years, 1 month ago) by jpye

Added new code for calculating properties according to modified BWR correlation, also some initial
work on Helmholtz free energy correlation.

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