Removed keyword-substitution cruft

This commit is contained in:
Ray Speth 2012-05-24 16:29:29 +00:00
parent 761c2589e3
commit 5af70f3db8
48 changed files with 26 additions and 281 deletions

View file

@ -1,5 +1,4 @@
#! /bin/sh
# $Id: bootstrap 469 2008-09-05 00:16:18Z rhys $
#
# bootstrap: Utility to easy autoconf/automake toolchain setup on
# checkout from revision control.

View file

@ -4,10 +4,7 @@
* allow for dimensioning of arbitrarily dimensioned pointer arrays using
* one call.
*/
/*
* $Revision$
* $Date$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -2,10 +2,6 @@
* @file BEulerInt.h
*/
/* $Author: hkmoffa $
* $Date: 2009/01/27 16:50:53 $
* $Revision: 1.19 $
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -1,17 +1,10 @@
/**
*
* @file DAE_Solver.h
*
* Header file for class DAE_Solver
*/
/*
* $Date$
* $Revision$
*
* Copyright 2006 California Institute of Technology
*
*/
// Copyright 2006 California Institute of Technology
#ifndef CT_DAE_Solver_H
#define CT_DAE_Solver_H

View file

@ -4,10 +4,6 @@
* (see class \ref numerics and \link Cantera::GeneralMatrix GeneralMatrix\endlink).
*/
/*
* $Date: 2011-10-13 15:16:06 -0600 (Thu, 13 Oct 2011) $
* $Revision: 776 $
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -26,10 +22,7 @@ namespace Cantera
//! Generic matrix
class GeneralMatrix
{
public:
//! Base Constructor
/*!
* @param matType Matrix type

View file

@ -1,17 +1,9 @@
/**
*
* @file IDA_Solver.h
*
* Header file for class IDA_Solver
*/
/* $Author$
* $Date$
* $Revision$
*
* Copyright 2006 California Institute of Technology
*
*/
// Copyright 2006 California Institute of Technology
#ifndef CT_IDA_SOLVER_H
#define CT_IDA_SOLVER_H

View file

@ -5,10 +5,6 @@
* and class \link Cantera::NonlinearSolver NonlinearSolver\endlink).
*/
/*
* $Date$
* $Revision$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -1,11 +1,7 @@
/**
* @file ResidEval.h
*
*/
/*
* $Date$
* $Revision$
*/
// Copyright 2006 California Institute of Technology
#ifndef CT_RESIDEVAL_H
@ -36,9 +32,7 @@ const int c_LT_ZERO = -2;
*/
class ResidEval
{
public:
ResidEval() {}
virtual ~ResidEval() {}

View file

@ -4,11 +4,6 @@
* Dense, Square (not sparse) matrices.
*/
/*
* $Date$
* $Revision$
*
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -16,7 +11,6 @@
* See file License.txt for licensing information.
*/
#ifndef CT_RESIDJACEVAL_H
#define CT_RESIDJACEVAL_H

View file

@ -3,9 +3,7 @@
* Header file for implicit nonlinear solver of a one dimensional function
* (see \ref numerics and class \link Cantera::RootFind RootFind\endlink).
*/
/*
* $Id$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -3,10 +3,6 @@
* Dense, Square (not sparse) matrices.
*/
/*
* $Date$
* $Revision$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -29,10 +25,7 @@ namespace Cantera
*/
class SquareMatrix: public DenseMatrix, public GeneralMatrix
{
public:
//! Base Constructor.
/*!
* Create an \c 0 by \c 0 matrix, and initialize all elements to \c 0.

View file

@ -3,9 +3,7 @@
* Header file for implicit nonlinear solver with the option of a pseudotransient
* (see \ref numerics and class \link Cantera::solveProb solveProb\endlink).
*/
/*
* $Id$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -19,7 +17,6 @@
* @defgroup solverGroup Solvers for Equation Systems
*/
#include <vector>
#include "cantera/base/Array.h"
#include "ResidEval.h"

View file

@ -11,11 +11,6 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Date: 2009-11-09 16:36:49 -0700 (Mon, 09 Nov 2009) $
* $Revision: 255 $
*/
#ifndef CT_FIXEDCHEMPOTSSTP_H
#define CT_FIXEDCHEMPOTSSTP_H

View file

@ -16,9 +16,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
/*
* $Id: MargulesVPSSTP.h 713 2011-04-14 18:24:13Z hkmoffa $
*/
#ifndef CT_MIXEDSOLVENTELECTROLYTEVPSSTP_H
#define CT_MIXEDSOLVENTELECTROLYTEVPSSTP_H

View file

@ -10,10 +10,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
/*
* $Date: 2010-08-04 10:06:14 -0600 (Wed, 04 Aug 2010) $
* $Revision: 547 $
*/
#ifndef CT_MIXTUREFUGACITYTP_H
#define CT_MIXTUREFUGACITYTP_H
@ -28,7 +24,6 @@ namespace Cantera
class XML_Node;
class PDSS;
//! Various states of the Fugacity object. In general there can be multiple liquid
//! objects for a single phase identified with each species.
@ -47,8 +42,6 @@ class PDSS;
#define FLUID_LIQUID_8 8
#define FLUID_LIQUID_9 9
/**
* @ingroup thermoprops
*

View file

@ -16,9 +16,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
/*
* $Id: MolarityIonicVPSSTP.h 255 2009-11-09 23:36:49Z hkmoffa $
*/
#ifndef CT_MOLARITYIONICVPSSTP_H
#define CT_MOLARITYIONICVPSSTP_H

View file

@ -5,22 +5,16 @@
* (see \ref thermoprops
* and class \link Cantera::PhaseCombo_Interaction PhaseCombo_Interaction\endlink).
*/
/*
* Copyright (2011) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
/*
* $Author: hkmoffa $
* $Date: 2009-11-09 16:36:49 -0700 (Mon, 09 Nov 2009) $
* $Revision: 255 $
*/
#ifndef CT_PHASECOMBO_INTERACTION_H
#define CT_PHASECOMBO_INTERACTION_H
#include "GibbsExcessVPSSTP.h"
namespace Cantera
@ -30,8 +24,6 @@ namespace Cantera
* @ingroup thermoprops
*/
//! PhaseCombo_Interaction is a derived class of GibbsExcessVPSSTP that employs
//! the Margules approximation for the excess gibbs free energy while eliminating
//! the entropy of mixing term.

View file

@ -16,9 +16,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
/*
* $Id$
*/
#ifndef CT_REDLICHKISTERVPSSTP_H
#define CT_REDLICHKISTERVPSSTP_H
@ -33,7 +30,6 @@ namespace Cantera
* @ingroup thermoprops
*/
//! RedlichKisterVPSSTP is a derived class of GibbsExcessVPSSTP that employs
//! the Redlich-Kister approximation for the excess gibbs free energy
/*!

View file

@ -2,12 +2,6 @@
* @file LTPspecies.h
* Header file defining class LTPspecies and its child classes
*/
/*
* $Author$
* $Date$
* $Revision$
*/
#ifndef CT_LTPSPECIES_H
#define CT_LTPSPECIES_H
@ -21,7 +15,6 @@
#include <vector>
#include <string>
namespace Cantera
{

View file

@ -3,12 +3,7 @@
* Header file defining the class LiquidTranInteraction and classes which
* derive from LiquidTranInteraction.
*/
/*
* $Author: christopher.lueth@gmail.com $
* $Date: 2010-03-30 12:30:39 -0600 (Tue, 30 Mar 2010) $
* $Revision: 427 $
*
*/
#ifndef CT_LIQUIDTRANINTERACTION_H
#define CT_LIQUIDTRANINTERACTION_H
@ -21,8 +16,6 @@
namespace Cantera
{
//! Composition dependence type for liquid mixture transport properties
/*!
* Types of temperature dependencies:

View file

@ -2,14 +2,7 @@
* @file LiquidTransportParams.h
* Header file defining class LiquidTransportParams
*/
/*
* $Author$
* $Date$
* $Revision$
*
*
*
*/
#ifndef CT_LIQUIDTRANSPORTPARAMS_H
#define CT_LIQUIDTRANSPORTPARAMS_H
@ -21,15 +14,10 @@
#include "cantera/base/xml.h"
#include "cantera/base/XML_Writer.h"
#include <vector>
namespace Cantera
{
//! Composition dependence type for liquid mixture transport properties
/*!
* Types of temperature dependencies:

View file

@ -10,14 +10,9 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#ifndef CT_TORTUOSITY_H
#define CT_TORTUOSITY_H
namespace Cantera
{

View file

@ -8,10 +8,6 @@
#
# Outputs a summary of relevant configuration settings.
#
# LAST MODIFICATION
#
# $Id: config_summary.m4 22758 2011-08-05 22:05:54Z nick $
#
AC_DEFUN([AX_SUMMARIZE_CONFIG],
[
@ -20,14 +16,14 @@ echo
echo '----------------------------------- SUMMARY -----------------------------------'
echo
echo Package version................. : $PACKAGE-$VERSION
echo
echo
echo C++ compiler.................... : $CXX
echo C++ compiler flags.............. : $CXXFLAGS
echo C compiler...................... : $CC
echo C compiler flags................ : $CFLAGS
echo Fortran compiler................ : $FC
echo Fortran compiler flags.......... : $FCFLAGS
echo Install dir..................... : $prefix
echo Install dir..................... : $prefix
echo Build user...................... : $USER
echo Build host...................... : $BUILD_HOST
echo Configure date.................. : $BUILD_DATE
@ -40,7 +36,7 @@ echo '--------------------------------------------------------------------------
echo
echo Configure complete, now type \'make\' and then \'make install\'.
echo
echo To verify your verification library, type \'make check\'
echo To verify your verification library, type \'make check\'
echo to run a suite of regression tests.
])

View file

@ -1,5 +1,3 @@
# $Id: $
# will need to add python and matlab
SUBDIRS = base numerics converters thermo transport oneD zeroD kinetics spectra equil fortran tpx

View file

@ -727,7 +727,6 @@ int main(int argc, char* argv[])
printf("\n");
printf("----------------------------------------------------------\n");
printf("csvdiff: CSVFile comparison utility program\n");
printf(" Version $Revision$\n");
printf(" Harry K. Moffat Div. 9114 Sandia National Labs\n");
printf(" \n");
printf(" First CSV File = %s\n", fileName1);

View file

@ -1,19 +1,7 @@
/**
* @file cti2ctml.cpp
*
*/
/*
* $Id$
*/
// Example
//
// Read a mechanism and a thermodynamics file for the
// class IdealSolidSolnPhase in order to test that it's
// working correctly
//
#include <iostream>
#include <string>
#include <vector>

View file

@ -2,9 +2,7 @@
* @file vcs_solve_TP.cpp Implementation file that contains the
* main algorithm for finding an equilibrium
*/
/*
* $Id: vcs_solve_TP.cpp 626 2010-10-28 01:33:54Z hkmoffa $
*/
/*
* Copyright (2005) Sandia Corporation. Under the terms of
* Contract DE-AC04-94AL85000 with Sandia Corporation, the

View file

@ -2,10 +2,7 @@
* @file DAE_solvers.cpp
* Factory routine for picking the DAE solver package
*/
/*
* $Revision: 725 $
* $Date: 2011-05-16 18:45:08 -0600 (Mon, 16 May 2011) $
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -13,7 +10,6 @@
* See file License.txt for licensing information.
*/
#include "cantera/base/ct_defs.h"
#include "cantera/numerics/DAE_Solver.h"
#include "cantera/numerics/IDA_Solver.h"
@ -22,21 +18,19 @@
#define DAE_DEVEL
#ifdef DAE_DEVEL
namespace Cantera {
DAE_Solver* newDAE_Solver(std::string itype, ResidJacEval& f) {
if (itype == "IDA") {
#ifdef HAS_SUNDIALS
return new IDA_Solver(f);
#else
throw CanteraError("newDAE_Solver","IDA solver requires sundials"
" package, but Cantera was not built with sundials.");
" package, but Cantera was not built with sundials.");
#endif
}
else {
throw CanteraError("newDAE_Solver",
"unknown DAE solver: "+itype);
"unknown DAE solver: "+itype);
}
}
}

View file

@ -1,11 +1,7 @@
/**
* @file GeneralMatrix.cpp
*
*/
/*
* $Revision: 725 $
* $Date: 2011-05-16 18:45:08 -0600 (Mon, 16 May 2011) $
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -5,10 +5,6 @@
* Damped Newton solver for 0D and 1D problems
*/
/*
* $Date$
* $Revision$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -35,18 +31,14 @@
#include <cmath>
//@{
#ifndef CONSTD_DATA_PTR
#define CONSTD_DATA_PTR(x) (( const doublereal *) (&x[0]))
#endif
//@}
using namespace std;
namespace Cantera
{
//====================================================================================================================
//-----------------------------------------------------------
// Constants
@ -3885,7 +3877,7 @@ int NonlinearSolver::beuler_jac(GeneralMatrix& J, doublereal* const f,
for (int i = ileft; i <= iright; i++) {
if (i >= 0 && i < (int) neq_) {
size_t ii = i;
size_t index = (int) kl + (int) ku + i - (int) j;
size_t index = (int) kl + (int) ku + i - (int) j;
diff = subtractRD(m_wksp[ii], f[ii]);
col_j[index] = diff / dy;
}

View file

@ -1,11 +1,7 @@
/**
* @file ResidJacEval.cpp
*
*/
/*
* $Revision$
* $Date$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -1,9 +1,7 @@
/*
* @file: RootFind.cpp root finder for 1D problems
*/
/*
* $Id$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government

View file

@ -1,11 +1,7 @@
/**
* @file DenseMatrix.cpp
*
*/
/*
* $Revision$
* $Date$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -21,7 +17,6 @@
#include <iostream>
#include <vector>
#include <cstring>
using namespace std;
@ -29,7 +24,6 @@ using namespace std;
namespace Cantera
{
//====================================================================================================================
SquareMatrix::SquareMatrix() :
DenseMatrix(),

View file

@ -1,9 +1,7 @@
/*
* @file: solveSP.cpp Implicit solver for nonlinear problems
*/
/*
* $Id$
*/
/*
* Copyright 2004 Sandia Corporation. Under the terms of Contract
* DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
@ -17,11 +15,9 @@
#include "cantera/base/stringUtils.h"
/* Standard include files */
#include <cstdio>
#include <cstdlib>
#include <cmath>
#include <vector>
using namespace std;
@ -34,11 +30,6 @@ namespace Cantera
static doublereal calcWeightedNorm(const doublereal [], const doublereal dx[], size_t);
/***************************************************************************
* LAPACK PROTOTYPES
***************************************************************************/
/***************************************************************************
* solveSP Class Definitinos
***************************************************************************/

View file

@ -1,12 +1,7 @@
/**
* @file Resid1D.h
*
* $Author$
* $Date$
* $Revision$
*
* Copyright 2002 California Institute of Technology
*
*/
#ifndef CT_RESID1D_H
@ -19,7 +14,6 @@
#include "cantera/base/xml.h"
#include "cantera/oneD/refine.h"
namespace Cantera
{

View file

@ -3,14 +3,8 @@
* definitions for the LTPspecies objects and its children, which is the virtual base class
* for describing temperature dependence of submodels for transport parameters
* (see \ref tranprops and \link Cantera::LTPspecies LTPspecies \endlink) .
*
*/
/*
* $Author$
* $Date$
* $Revision$
*
*/
#include "cantera/transport/LTPspecies.h"
using namespace std;
using namespace ctml;

View file

@ -2,11 +2,6 @@
* @file LiquidTransportData.cpp
* Source code for liquid transport property evaluations.
*/
/*
* $Author$
* $Date$
* $Revision$
*/
#include "cantera/transport/LiquidTransportData.h"
using namespace std;

View file

@ -2,12 +2,6 @@
* @file LiquidTransportParams.cpp
* Source code for liquid mixture transport property evaluations.
*/
/*
* Latest Checkin:
* $Author$
* $Date$
* $Revision$
*/
#include "cantera/transport/LiquidTransportParams.h"
#include <iostream>
@ -16,7 +10,6 @@
#include <stdlib.h>
using namespace std;
namespace Cantera
{

View file

@ -10,11 +10,6 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#include "TortuosityBase.h"
#include "cantera/base/ctexceptions.h"

View file

@ -10,16 +10,11 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#ifndef CT_TORTUOSITYBASE_H
#define CT_TORTUOSITYBASE_H
#include "cantera/base/ct_defs.h"
namespace Cantera
{

View file

@ -10,11 +10,6 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#include "TortuosityBruggeman.h"
#include "cantera/base/ctexceptions.h"

View file

@ -10,16 +10,11 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#ifndef CT_TORTUOSITYBRUGGEMAN_H
#define CT_TORTUOSITYBRUGGEMAN_H
#include "TortuosityBase.h"
namespace Cantera
{

View file

@ -10,11 +10,6 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#include "TortuosityMaxwell.h"
#include "cantera/base/ctexceptions.h"

View file

@ -10,16 +10,11 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#ifndef CT_TORTUOSITYBRUGGEMAN_H
#define CT_TORTUOSITYBRUGGEMAN_H
#include "TortuosityBase.h"
namespace Cantera
{

View file

@ -10,11 +10,6 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#include "TortuosityPercolation.h"
#include "cantera/base/ctexceptions.h"

View file

@ -10,25 +10,16 @@
* U.S. Government retains certain rights in this software.
*/
/*
* $Revision: 572 $
* $Date: 2010-08-13 20:21:57 -0600 (Fri, 13 Aug 2010) $
*/
#ifndef CT_TORTUOSITYPERCOLATION_H
#define CT_TORTUOSITYPERCOLATION_H
#include "TortuosityBase.h"
namespace Cantera
{
//! This class implements transport coefficient corrections
//! appropriate for porous media where percollation theory applies.
/*!
*
*
*/
class TortuosityPercolation : public TortuosityBase
{

View file

@ -4,12 +4,6 @@
* processing of the transport object
* (see \ref tranprops and \link Cantera::TransportParams TransportParams \endlink).
*/
/*
* Latest Checkin:
* $Author$
* $Date$
* $Revision$
*/
#include "cantera/transport/TransportParams.h"
@ -18,7 +12,6 @@
#endif
using namespace std;
namespace Cantera
{
//====================================================================================================================

View file

@ -1,6 +1,5 @@
#!/bin/sh
# $Id: runtest.in,v 1.1 2007/09/13 15:12:46 hkmoffa Exp $
#
echo " "
echo "***************************************************"
echo " Testing CK2CTI on NASA9 Thermodynamics : using the build/bin version of ck2cti"
@ -10,7 +9,7 @@ BINDIR=@buildbin@
CK2CTI=$BINDIR/ck2cti
/bin/rm -f sample.cti
echo "...Test 1: Converting file sample.inp..."
$CK2CTI -i ./sample.inp -id sample -t sampleData.inp
$CK2CTI -i ./sample.inp -id sample -t sampleData.inp
#
# strip out variably dated stuff
#