From 53e0d440caa1a1dbba0197844064395a56ac04b8 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 24 Mar 2009 20:04:26 +0000
Subject: [PATCH] Checking in high lvl dir.

---
 .../python/examples/liquid_vapor/Makefile.in  | 24 ++++-
 .../examples/liquid_vapor/critProperties.py   | 29 ------
 .../python/examples/liquid_vapor/rankine.py   | 94 -------------------
 3 files changed, 20 insertions(+), 127 deletions(-)
 delete mode 100644 Cantera/python/examples/liquid_vapor/critProperties.py
 delete mode 100644 Cantera/python/examples/liquid_vapor/rankine.py

diff --git a/Cantera/python/examples/liquid_vapor/Makefile.in b/Cantera/python/examples/liquid_vapor/Makefile.in
index 306e98e40..710e67bf2 100644
--- a/Cantera/python/examples/liquid_vapor/Makefile.in
+++ b/Cantera/python/examples/liquid_vapor/Makefile.in
@@ -1,16 +1,32 @@
 #!/bin/sh
 
-PY_DEMOS = critProperties.py rankine.py
-PYTHON_CMD = @PYTHON_CMD@
+PY_DEMOS = critProperties rankine
+
+all:
+	@(for py in $(PY_DEMOS) ; do \
+	    echo "running $${py}..."; \
+	  (cd $${ph} ; @MAKE@ ) \
+	done)
 
 run:
 	@(for py in $(PY_DEMOS) ; do \
 	    echo "running $${py}..."; \
-          $(PYTHON_CMD) "$${py}"; \
+	  (cd $${ph} ; @MAKE@ run ) \
+	done)
+
+test:
+	@(for py in $(PY_DEMOS) ; do \
+	    echo "running $${py}..."; \
+	  (cd $${ph} ; @MAKE@ test) \
 	done)
 
 clean:
-	rm -f *.log *.csv *.xml
+	@(for py in $(PY_DEMOS) ; do \
+	    echo "running $${py}..."; \
+	  (cd $${ph} ; @MAKE@ clean) \
+	done)
+
+
 
 # end of file
 
diff --git a/Cantera/python/examples/liquid_vapor/critProperties.py b/Cantera/python/examples/liquid_vapor/critProperties.py
deleted file mode 100644
index c2b42c61d..000000000
--- a/Cantera/python/examples/liquid_vapor/critProperties.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Print the critical state properties for the fluids for which Cantera has
-built-in liquid/vapor equations of state.
-"""
-
-from Cantera import *
-from Cantera.liquidvapor import *
-
-fluids = {'water':Water(),
-          'nitrogen':Nitrogen(),
-          'methane':Methane(),
-          'hydrogen':Hydrogen(),
-          'oxygen':Oxygen(),
-          'carbondioxide':CarbonDioxide(),
-          'heptane':Heptane()
-          }
-
-print 'Critical State Properties'
-print '%20s  %10s  %10s  %10s' % ('Fluid','Tc [K]', 'Pc [Pa]', 'Zc')
-for name in fluids.keys():
-    f = fluids[name]
-    tc = f.critTemperature()
-    pc = f.critPressure()
-    rc = f.critDensity()
-    mw = f.meanMolecularWeight()
-    zc = pc*mw/(rc*GasConstant*tc)
-    print '%20s   %10.4g   %10.4G  %10.4G' % (name, tc, pc, zc)
-    
-
diff --git a/Cantera/python/examples/liquid_vapor/rankine.py b/Cantera/python/examples/liquid_vapor/rankine.py
deleted file mode 100644
index e4095eec8..000000000
--- a/Cantera/python/examples/liquid_vapor/rankine.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# A Rankine vapor power cycle
-#
-
-from Cantera import *
-from Cantera.liquidvapor import Water
-
-
-########################################################
-#
-# parameters
-#
-
-eta_pump = 0.6     # pump isentropic efficiency
-eta_turbine = 0.8  # turbine isentropic efficiency
-pmax = 8.0e5       # maximum pressure
-
-
-########################################################
-#
-# some useful functions
-#
-
-def pump(fluid, pfinal, eta):
-    """Adiabatically pump a fluid to pressure pfinal, using
-    a pump with isentropic efficiency eta."""
-    h0 = fluid.enthalpy_mass()
-    s0 = fluid.entropy_mass()
-    fluid.set(S = s0, P = pfinal)
-    h1s = fluid.enthalpy_mass()
-    isentropic_work = h1s - h0
-    actual_work = isentropic_work / eta
-    h1 = h0 + actual_work
-    fluid.set(H = h1, P = pfinal)
-    return actual_work
-
-
-def expand(fluid, pfinal, eta):
-    """Adiabatically expand a fluid to pressure pfinal, using
-    a turbine with isentropic efficiency eta."""
-    h0 = fluid.enthalpy_mass()
-    s0 = fluid.entropy_mass()
-    fluid.set(S = s0, P = pfinal)
-    h1s = fluid.enthalpy_mass()
-    isentropic_work = h0 - h1s
-    actual_work = isentropic_work * eta
-    h1 = h0 - actual_work
-    fluid.set(H = h1, P = pfinal)
-    return actual_work
-
-
-def printState(n, fluid):
-    print '\n\n***************** State '+`n`+' ******************\n', fluid
-    
-
-###############################################################
-
-
-# create an object representing water
-w = Water()
-
-# start with saturated liquid water at 300 K
-w.set(T = 300.0, Vapor = 0.0)
-h1 = w.enthalpy_mass()
-p1 = w.pressure()
-printState(1,w)
-
-# pump it adiabatically to pmax
-pump_work = pump(w, pmax, eta_pump)
-h2 = w.enthalpy_mass()
-printState(2,w)
-
-# heat it at constant pressure until it reaches the
-# saturated vapor state at this pressure
-w.set(P = pmax, Vapor = 1.0)
-h3 = w.enthalpy_mass()
-heat_added = h3 - h2
-printState(3,w)
-
-# expand back to p1
-turbine_work = expand(w, p1, eta_turbine)
-printState(4,w)
-
-# efficiency
-eff = (turbine_work - pump_work)/heat_added
-
-print 'efficiency = ',eff
-
-
-
-
-
-
-