From f0533e0f5b893f6a8aa7d10c30e2b54ad7262a41 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Fri, 6 Aug 2004 14:43:08 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/matlab/setup_winmatlab.py | 8 ++++---- tools/templates/f90/demo.f90 | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Cantera/matlab/setup_winmatlab.py b/Cantera/matlab/setup_winmatlab.py index 9bae17b0f..9b33fffd4 100644 --- a/Cantera/matlab/setup_winmatlab.py +++ b/Cantera/matlab/setup_winmatlab.py @@ -1,16 +1,16 @@ import sys -bindir = '/home/goodwin/ct154g/bin' -libdir = '/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu' -incdir = '/home/goodwin/dv/sf/cantera/build/include' +bindir = '/Applications/Cantera/bin' +libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.4.0' +incdir = '/Users/dgg/dv/sf/cantera/build/include' dflibdir = '' bllibstr = "-lctlapack -lctblas" bllibs = bllibstr.replace('-l',' ') bllist = bllibs.split() -bldir = "/home/goodwin/dv/sf/cantera/build/lib/i686-pc-linux-gnu" +bldir = "/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.4.0" libs = ['clib', 'oneD', 'zeroD', 'transport', 'cantera', 'recipes', 'cvode', 'ctmath', 'tpx'] diff --git a/tools/templates/f90/demo.f90 b/tools/templates/f90/demo.f90 index 87db22d70..528639cd7 100644 --- a/tools/templates/f90/demo.f90 +++ b/tools/templates/f90/demo.f90 @@ -1,10 +1,5 @@ -! -! Replace this sample main program with your program -! -! This program uses functions defined in demo_ftnlib.cpp to create -! an ideal gas mixture and print some its properties. -! -! For a C++ version of this program, type 'ctnew -cxx'. +! This program illustrates using Cantera in Fortran 90 to compute +! thermodynamic, kinetic, and transport properties of a gas mixture. ! program main @@ -12,6 +7,7 @@ program main use cantera implicit none + ! objects representing phases of matter have type 'phase_t' type(phase_t) gas integer nsp, nrxns @@ -62,7 +58,7 @@ subroutine demo(gas, MAXSP, MAXRXNS) character*80 eq character*20 name - double precision :: t, p, dnu, dlam + double precision :: dnu, dlam integer :: i, irxns, nsp, k write(*,*) 'Initial state properties:'