From ecbfecd7fd5e208942b2e240396e62fd990acc88 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 10 Oct 2016 22:19:01 -0400 Subject: [PATCH] Replace existing copyright notices with uniform copyright/license info --- include/cantera/base/Array.h | 4 +++- include/cantera/base/clockWC.h | 9 +++------ include/cantera/base/ct_defs.h | 3 ++- include/cantera/base/ctexceptions.h | 4 +++- include/cantera/base/ctml.h | 4 +++- include/cantera/base/global.h | 4 +++- include/cantera/base/plots.h | 4 +++- include/cantera/base/stringUtils.h | 4 +++- include/cantera/base/utilities.h | 4 +++- include/cantera/base/xml.h | 4 +++- include/cantera/equil/ChemEquil.h | 6 +++--- include/cantera/equil/MultiPhase.h | 4 +++- include/cantera/equil/vcs_VolPhase.h | 8 +++----- include/cantera/equil/vcs_defs.h | 8 +++----- include/cantera/equil/vcs_internal.h | 7 ++----- include/cantera/equil/vcs_prob.h | 8 +++----- include/cantera/equil/vcs_solve.h | 8 +++----- include/cantera/equil/vcs_species_thermo.h | 7 ++----- include/cantera/kinetics/AqueousKinetics.h | 3 ++- include/cantera/kinetics/EdgeKinetics.h | 4 +++- include/cantera/kinetics/FalloffFactory.h | 4 +++- include/cantera/kinetics/FalloffMgr.h | 3 ++- include/cantera/kinetics/GasKinetics.h | 3 ++- include/cantera/kinetics/Group.h | 3 ++- include/cantera/kinetics/ImplicitSurfChem.h | 4 +++- include/cantera/kinetics/InterfaceKinetics.h | 4 +++- include/cantera/kinetics/Kinetics.h | 3 ++- include/cantera/kinetics/KineticsFactory.h | 3 ++- include/cantera/kinetics/RateCoeffMgr.h | 3 ++- include/cantera/kinetics/ReactionPath.h | 3 ++- include/cantera/kinetics/RxnRates.h | 4 +++- include/cantera/kinetics/StoichManager.h | 3 ++- include/cantera/kinetics/importKinetics.h | 4 +++- include/cantera/kinetics/reaction_defs.h | 3 ++- include/cantera/kinetics/solveSP.h | 9 +++------ include/cantera/numerics/BandMatrix.h | 3 ++- include/cantera/numerics/CVodesIntegrator.h | 4 +++- include/cantera/numerics/DAE_Solver.h | 3 ++- include/cantera/numerics/DenseMatrix.h | 3 ++- include/cantera/numerics/Func1.h | 3 ++- include/cantera/numerics/FuncEval.h | 3 ++- include/cantera/numerics/GeneralMatrix.h | 8 ++------ include/cantera/numerics/IDA_Solver.h | 3 ++- include/cantera/numerics/Integrator.h | 3 ++- include/cantera/numerics/ResidEval.h | 3 ++- include/cantera/numerics/ResidJacEval.h | 8 ++------ include/cantera/numerics/RootFind.h | 8 ++------ include/cantera/numerics/SquareMatrix.h | 8 ++------ include/cantera/numerics/ctlapack.h | 4 +++- include/cantera/numerics/funcs.h | 8 ++++---- include/cantera/numerics/polyfit.h | 7 +++---- include/cantera/oneD/Domain1D.h | 5 ++--- include/cantera/oneD/Inlet1D.h | 5 ++--- include/cantera/oneD/MultiJac.h | 5 ++--- include/cantera/oneD/MultiNewton.h | 5 ++--- include/cantera/oneD/StFlow.h | 3 ++- include/cantera/thermo/AdsorbateThermo.h | 4 +++- include/cantera/thermo/ConstCpPoly.h | 4 +++- include/cantera/thermo/ConstDensityThermo.h | 6 +++--- include/cantera/thermo/DebyeHuckel.h | 8 +++----- include/cantera/thermo/EdgePhase.h | 3 ++- include/cantera/thermo/Elements.h | 4 +++- include/cantera/thermo/FixedChemPotSSTP.h | 7 ++----- include/cantera/thermo/GibbsExcessVPSSTP.h | 9 ++++----- include/cantera/thermo/HMWSoln.h | 9 ++++----- include/cantera/thermo/IdealGasPhase.h | 4 +++- include/cantera/thermo/IdealMolalSoln.h | 9 ++++----- include/cantera/thermo/IdealSolidSolnPhase.h | 8 +++----- include/cantera/thermo/IdealSolnGasVPSS.h | 9 ++++----- include/cantera/thermo/IonsFromNeutralVPSSTP.h | 9 ++++----- include/cantera/thermo/LatticePhase.h | 3 ++- include/cantera/thermo/LatticeSolidPhase.h | 3 ++- include/cantera/thermo/MargulesVPSSTP.h | 9 ++++----- include/cantera/thermo/MaskellSolidSolnPhase.h | 8 +++----- include/cantera/thermo/MetalPhase.h | 3 ++- include/cantera/thermo/MetalSHEelectrons.h | 8 +++----- include/cantera/thermo/MineralEQ3.h | 10 +++------- include/cantera/thermo/MixedSolventElectrolyte.h | 8 +++----- include/cantera/thermo/MixtureFugacityTP.h | 8 +++----- include/cantera/thermo/MolalityVPSSTP.h | 9 ++++----- include/cantera/thermo/MolarityIonicVPSSTP.h | 8 +++----- include/cantera/thermo/Nasa9Poly1.h | 8 +++----- include/cantera/thermo/Nasa9PolyMultiTempRegion.h | 4 +++- include/cantera/thermo/NasaPoly1.h | 4 +++- include/cantera/thermo/NasaPoly2.h | 4 +++- include/cantera/thermo/PDSS.h | 9 ++++----- include/cantera/thermo/PDSS_ConstVol.h | 9 ++++----- include/cantera/thermo/PDSS_HKFT.h | 8 +++----- include/cantera/thermo/PDSS_IdealGas.h | 9 ++++----- include/cantera/thermo/PDSS_IonsFromNeutral.h | 9 ++++----- include/cantera/thermo/PDSS_SSVol.h | 9 ++++----- include/cantera/thermo/PDSS_Water.h | 9 ++++----- include/cantera/thermo/Phase.h | 4 +++- include/cantera/thermo/PhaseCombo_Interaction.h | 7 ++----- include/cantera/thermo/PureFluidPhase.h | 3 ++- include/cantera/thermo/RedlichKisterVPSSTP.h | 8 +++----- include/cantera/thermo/RedlichKwongMFTP.h | 7 ++----- include/cantera/thermo/SemiconductorPhase.h | 3 ++- include/cantera/thermo/ShomatePoly.h | 4 +++- include/cantera/thermo/SingleSpeciesTP.h | 9 ++++----- include/cantera/thermo/SpeciesThermoFactory.h | 4 +++- include/cantera/thermo/SpeciesThermoInterpType.h | 3 ++- include/cantera/thermo/StoichSubstance.h | 8 +++----- include/cantera/thermo/SurfPhase.h | 3 ++- include/cantera/thermo/ThermoFactory.h | 4 +++- include/cantera/thermo/ThermoPhase.h | 3 ++- include/cantera/thermo/VPSSMgr.h | 8 +++----- include/cantera/thermo/VPSSMgr_ConstVol.h | 8 +++----- include/cantera/thermo/VPSSMgr_General.h | 8 +++----- include/cantera/thermo/VPSSMgr_IdealGas.h | 8 +++----- include/cantera/thermo/VPSSMgr_Water_ConstVol.h | 8 +++----- include/cantera/thermo/VPSSMgr_Water_HKFT.h | 8 +++----- include/cantera/thermo/VPStandardStateTP.h | 9 ++++----- include/cantera/thermo/WaterProps.h | 9 ++++----- include/cantera/thermo/WaterPropsIAPWS.h | 9 ++++----- include/cantera/thermo/WaterPropsIAPWSphi.h | 9 ++++----- include/cantera/thermo/WaterSSTP.h | 9 ++++----- include/cantera/thermo/electrolytes.h | 9 ++++----- include/cantera/thermo/speciesThermoTypes.h | 4 +++- include/cantera/transport/DustyGasTransport.h | 3 ++- include/cantera/transport/MixTransport.h | 3 ++- include/cantera/transport/MultiTransport.h | 3 ++- include/cantera/transport/SolidTransport.h | 3 ++- include/cantera/transport/Tortuosity.h | 7 ++----- include/cantera/transport/TransportBase.h | 4 +++- include/cantera/transport/TransportFactory.h | 4 +++- include/cantera/zeroD/ConstPressureReactor.h | 3 ++- include/cantera/zeroD/FlowDevice.h | 3 ++- include/cantera/zeroD/FlowReactor.h | 3 ++- include/cantera/zeroD/IdealGasConstPressureReactor.h | 3 ++- include/cantera/zeroD/IdealGasReactor.h | 3 ++- include/cantera/zeroD/Reactor.h | 3 ++- include/cantera/zeroD/ReactorBase.h | 3 ++- include/cantera/zeroD/ReactorFactory.h | 3 ++- include/cantera/zeroD/ReactorNet.h | 3 ++- include/cantera/zeroD/Reservoir.h | 3 ++- include/cantera/zeroD/Wall.h | 3 ++- include/cantera/zeroD/flowControllers.h | 3 ++- .../cantera/examples/onedim/diffusion_flame_batch.py | 11 ++++------- .../examples/onedim/diffusion_flame_extinction.py | 11 ++++------- samples/cxx/kinetics1/kinetics1.cpp | 5 +++-- src/base/checkFinite.cpp | 9 +++------ src/base/clockWC.cpp | 9 +++------ src/base/ct2ctml.cpp | 4 +++- src/base/ctml.cpp | 4 +++- src/base/plots.cpp | 4 +++- src/base/stringUtils.cpp | 4 +++- src/base/units.h | 4 +++- src/base/xml.cpp | 4 +++- src/equil/ChemEquil.cpp | 3 ++- src/equil/vcs_Gibbs.cpp | 8 +++----- src/equil/vcs_MultiPhaseEquil.cpp | 8 +++----- src/equil/vcs_VolPhase.cpp | 9 ++++----- src/equil/vcs_elem_rearrange.cpp | 8 +++----- src/equil/vcs_inest.cpp | 8 +++----- src/equil/vcs_nondim.cpp | 8 +++----- src/equil/vcs_prep.cpp | 7 ++----- src/equil/vcs_prob.cpp | 8 +++----- src/equil/vcs_rearrange.cpp | 8 +++----- src/equil/vcs_report.cpp | 8 +++----- src/equil/vcs_rxnadj.cpp | 8 +++----- src/equil/vcs_setMolesLinProg.cpp | 8 +++----- src/equil/vcs_solve.cpp | 8 +++----- src/equil/vcs_solve_TP.cpp | 8 +++----- src/equil/vcs_solve_phaseStability.cpp | 7 ++----- src/equil/vcs_species_thermo.cpp | 8 +++----- src/equil/vcs_util.cpp | 8 +++----- src/fortran/fctxml.cpp | 3 ++- src/kinetics/AqueousKinetics.cpp | 8 +++----- src/kinetics/FalloffFactory.cpp | 4 +++- src/kinetics/GasKinetics.cpp | 3 ++- src/kinetics/Group.cpp | 3 ++- src/kinetics/ImplicitSurfChem.cpp | 4 +++- src/kinetics/InterfaceKinetics.cpp | 3 ++- src/kinetics/Kinetics.cpp | 4 +++- src/kinetics/KineticsFactory.cpp | 4 +++- src/kinetics/ReactionPath.cpp | 4 +++- src/kinetics/importKinetics.cpp | 4 +++- src/kinetics/solveSP.cpp | 9 +++------ src/numerics/BandMatrix.cpp | 3 ++- src/numerics/CVodesIntegrator.cpp | 4 +++- src/numerics/DAE_solvers.cpp | 8 ++------ src/numerics/DenseMatrix.cpp | 3 ++- src/numerics/IDA_Solver.cpp | 3 ++- src/numerics/ResidJacEval.cpp | 8 ++------ src/numerics/RootFind.cpp | 8 ++------ src/numerics/SquareMatrix.cpp | 8 ++------ src/numerics/funcs.cpp | 6 ++---- src/oneD/MultiJac.cpp | 5 ++--- src/oneD/MultiNewton.cpp | 5 ++--- src/oneD/StFlow.cpp | 3 ++- src/oneD/boundaries1D.cpp | 3 ++- src/thermo/ConstCpPoly.cpp | 4 +++- src/thermo/ConstDensityThermo.cpp | 4 +++- src/thermo/DebyeHuckel.cpp | 8 +++----- src/thermo/Elements.cpp | 3 ++- src/thermo/FixedChemPotSSTP.cpp | 7 ++----- src/thermo/GibbsExcessVPSSTP.cpp | 9 ++++----- src/thermo/HMWSoln.cpp | 8 +++----- src/thermo/HMWSoln_input.cpp | 9 ++++----- src/thermo/IdealMolalSoln.cpp | 9 ++++----- src/thermo/IdealSolidSolnPhase.cpp | 8 +++----- src/thermo/IdealSolnGasVPSS.cpp | 8 +++----- src/thermo/IonsFromNeutralVPSSTP.cpp | 9 ++++----- src/thermo/MargulesVPSSTP.cpp | 9 ++++----- src/thermo/MaskellSolidSolnPhase.cpp | 8 +++----- src/thermo/MetalSHEelectrons.cpp | 9 +++------ src/thermo/MineralEQ3.cpp | 10 +++------- src/thermo/MixedSolventElectrolyte.cpp | 8 +++----- src/thermo/MixtureFugacityTP.cpp | 8 +++----- src/thermo/MolalityVPSSTP.cpp | 9 ++++----- src/thermo/MolarityIonicVPSSTP.cpp | 9 ++++----- src/thermo/MultiSpeciesThermo.cpp | 4 +++- src/thermo/Nasa9Poly1.cpp | 4 +++- src/thermo/Nasa9PolyMultiTempRegion.cpp | 4 +++- src/thermo/PDSS.cpp | 9 ++++----- src/thermo/PDSS_ConstVol.cpp | 9 ++++----- src/thermo/PDSS_HKFT.cpp | 8 +++----- src/thermo/PDSS_IdealGas.cpp | 9 ++++----- src/thermo/PDSS_IonsFromNeutral.cpp | 8 +++----- src/thermo/PDSS_SSVol.cpp | 9 ++++----- src/thermo/PDSS_Water.cpp | 9 ++++----- src/thermo/Phase.cpp | 3 ++- src/thermo/PhaseCombo_Interaction.cpp | 8 +++----- src/thermo/RedlichKisterVPSSTP.cpp | 8 +++----- src/thermo/RedlichKwongMFTP.cpp | 7 ++----- src/thermo/SingleSpeciesTP.cpp | 8 +++----- src/thermo/SpeciesThermoFactory.cpp | 4 +++- src/thermo/SpeciesThermoInterpType.cpp | 4 +++- src/thermo/StoichSubstance.cpp | 10 +++------- src/thermo/SurfPhase.cpp | 4 +++- src/thermo/ThermoFactory.cpp | 4 +++- src/thermo/ThermoPhase.cpp | 3 ++- src/thermo/VPSSMgr.cpp | 8 +++----- src/thermo/VPSSMgrFactory.cpp | 8 +++----- src/thermo/VPSSMgrFactory.h | 8 +++----- src/thermo/VPSSMgr_ConstVol.cpp | 8 +++----- src/thermo/VPSSMgr_General.cpp | 8 +++----- src/thermo/VPSSMgr_IdealGas.cpp | 8 +++----- src/thermo/VPSSMgr_Water_ConstVol.cpp | 7 ++----- src/thermo/VPSSMgr_Water_HKFT.cpp | 7 ++----- src/thermo/VPStandardStateTP.cpp | 8 +++----- src/thermo/WaterProps.cpp | 8 +++----- src/thermo/WaterPropsIAPWS.cpp | 9 ++++----- src/thermo/WaterPropsIAPWSphi.cpp | 9 ++++----- src/thermo/WaterSSTP.cpp | 8 +++----- src/transport/DustyGasTransport.cpp | 6 ++---- src/transport/MMCollisionInt.cpp | 4 +++- src/transport/MMCollisionInt.h | 4 +++- src/transport/MixTransport.cpp | 4 +++- src/transport/MultiTransport.cpp | 7 +++---- src/transport/SolidTransport.cpp | 4 +++- src/zeroD/ConstPressureReactor.cpp | 3 ++- src/zeroD/FlowReactor.cpp | 3 ++- src/zeroD/IdealGasConstPressureReactor.cpp | 3 ++- src/zeroD/Reactor.cpp | 3 ++- src/zeroD/ReactorBase.cpp | 3 ++- src/zeroD/ReactorFactory.cpp | 3 ++- test_problems/CpJump/CpJump.cpp | 5 ++--- test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp | 5 ++--- test_problems/VPsilane_test/silane_equil.cpp | 5 ++--- test_problems/cathermo/VPissp/ISSPTester.cpp | 9 +++------ test_problems/cathermo/ims/IMSTester.cpp | 9 +++------ test_problems/cathermo/issp/ISSPTester.cpp | 9 +++------ test_problems/cxx_ex/equil_example1.cpp | 4 +++- test_problems/cxx_ex/kinetics_example1.cpp | 5 +++-- test_problems/cxx_ex/kinetics_example3.cpp | 5 +++-- test_problems/cxx_ex/rxnpath_example1.cpp | 5 +++-- test_problems/cxx_ex/transport_example1.cpp | 5 +++-- test_problems/cxx_ex/transport_example2.cpp | 5 +++-- test_problems/shared/TemperatureTable.h | 7 ++----- test_problems/silane_equil/silane_equil.cpp | 5 ++--- test_problems/surfSolverTest/surfaceSolver.cpp | 10 ++++------ test_problems/surfSolverTest/surfaceSolver2.cpp | 10 ++++------ 274 files changed, 765 insertions(+), 864 deletions(-) diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h index 8f7636f39..52c4f020b 100644 --- a/include/cantera/base/Array.h +++ b/include/cantera/base/Array.h @@ -1,7 +1,9 @@ /** * @file Array.h Header file for class Cantera::Array2D */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_ARRAY_H #define CT_ARRAY_H diff --git a/include/cantera/base/clockWC.h b/include/cantera/base/clockWC.h index eeb7e806a..66cafb9d4 100644 --- a/include/cantera/base/clockWC.h +++ b/include/cantera/base/clockWC.h @@ -3,12 +3,9 @@ * Declarations for a simple class that implements an Ansi C wall clock timer * (see \ref Cantera::clockWC). */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CLOCKWC_H #define CT_CLOCKWC_H diff --git a/include/cantera/base/ct_defs.h b/include/cantera/base/ct_defs.h index 6eb08d0f3..534e2c83a 100644 --- a/include/cantera/base/ct_defs.h +++ b/include/cantera/base/ct_defs.h @@ -8,8 +8,9 @@ * All physical constants are stored here. * The module physConstants is defined here. */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_DEFS_H #define CT_DEFS_H diff --git a/include/cantera/base/ctexceptions.h b/include/cantera/base/ctexceptions.h index c01bcabe6..51b924cce 100644 --- a/include/cantera/base/ctexceptions.h +++ b/include/cantera/base/ctexceptions.h @@ -4,7 +4,9 @@ * thrown when %Cantera experiences an error condition * (also contains errorhandling module text - see \ref errorhandling). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CTEXCEPTIONS_H #define CT_CTEXCEPTIONS_H diff --git a/include/cantera/base/ctml.h b/include/cantera/base/ctml.h index ae810412e..75c6344d9 100644 --- a/include/cantera/base/ctml.h +++ b/include/cantera/base/ctml.h @@ -4,7 +4,9 @@ * to store data. These functions read and write it. * (see \ref inputfiles and importCTML, ck2ctml) */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CTML_H #define CT_CTML_H diff --git a/include/cantera/base/global.h b/include/cantera/base/global.h index d616758dc..ffcbeda0f 100644 --- a/include/cantera/base/global.h +++ b/include/cantera/base/global.h @@ -12,7 +12,9 @@ * - logs (see \ref logs) * - textlogs (see \ref textlogs) */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_GLOBAL_H #define CT_GLOBAL_H diff --git a/include/cantera/base/plots.h b/include/cantera/base/plots.h index e8c5b96ec..6bfd50cc9 100644 --- a/include/cantera/base/plots.h +++ b/include/cantera/base/plots.h @@ -2,7 +2,9 @@ * @file plots.h Contains declarations for utility functions for outputing to * plotting programs. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_PLOTS_H #define CT_PLOTS_H diff --git a/include/cantera/base/stringUtils.h b/include/cantera/base/stringUtils.h index 8ecd622cd..4a206cad7 100644 --- a/include/cantera/base/stringUtils.h +++ b/include/cantera/base/stringUtils.h @@ -2,7 +2,9 @@ * @file stringUtils.h Contains declarations for string manipulation * functions within Cantera. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_STRINGUTILS_H #define CT_STRINGUTILS_H diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h index 1f0b00758..caaa67ddf 100644 --- a/include/cantera/base/utilities.h +++ b/include/cantera/base/utilities.h @@ -4,7 +4,9 @@ * operations (see \ref utils). */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + /** * @defgroup utils Templated Utility Functions * diff --git a/include/cantera/base/xml.h b/include/cantera/base/xml.h index f97ee1a80..e9811fff0 100644 --- a/include/cantera/base/xml.h +++ b/include/cantera/base/xml.h @@ -4,7 +4,9 @@ * implement only those aspects of XML required to read, write, and * manipulate CTML data files. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_XML_H #define CT_XML_H diff --git a/include/cantera/equil/ChemEquil.h b/include/cantera/equil/ChemEquil.h index 11d6fcf42..1033a0050 100644 --- a/include/cantera/equil/ChemEquil.h +++ b/include/cantera/equil/ChemEquil.h @@ -1,9 +1,9 @@ /** * @file ChemEquil.h Chemical equilibrium. */ -/* - * Copyright 2001 California Institute of Technology - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CHEM_EQUIL_H #define CT_CHEM_EQUIL_H diff --git a/include/cantera/equil/MultiPhase.h b/include/cantera/equil/MultiPhase.h index d2651310d..5a538d478 100644 --- a/include/cantera/equil/MultiPhase.h +++ b/include/cantera/equil/MultiPhase.h @@ -3,7 +3,9 @@ * Headers for the \link Cantera::MultiPhase MultiPhase\endlink * object that is used to set up multiphase equilibrium problems (see \ref equilfunctions). */ -// Copyright 2004 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MULTIPHASE_H #define CT_MULTIPHASE_H diff --git a/include/cantera/equil/vcs_VolPhase.h b/include/cantera/equil/vcs_VolPhase.h index 1a93667bc..a32e3a1e0 100644 --- a/include/cantera/equil/vcs_VolPhase.h +++ b/include/cantera/equil/vcs_VolPhase.h @@ -2,11 +2,9 @@ * @file vcs_VolPhase.h * Header for the object representing each phase within vcs */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef VCS_VOLPHASE_H #define VCS_VOLPHASE_H diff --git a/include/cantera/equil/vcs_defs.h b/include/cantera/equil/vcs_defs.h index e70208430..5d84223f0 100644 --- a/include/cantera/equil/vcs_defs.h +++ b/include/cantera/equil/vcs_defs.h @@ -2,11 +2,9 @@ * @file vcs_defs.h * Defines and definitions within the vcs package */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef VCS_DEFS_H #define VCS_DEFS_H diff --git a/include/cantera/equil/vcs_internal.h b/include/cantera/equil/vcs_internal.h index 17c22819a..4d103a67c 100644 --- a/include/cantera/equil/vcs_internal.h +++ b/include/cantera/equil/vcs_internal.h @@ -2,11 +2,8 @@ * @file vcs_internal.h Internal declarations for the VCSnonideal package */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef _VCS_INTERNAL_H #define _VCS_INTERNAL_H diff --git a/include/cantera/equil/vcs_prob.h b/include/cantera/equil/vcs_prob.h index 1e4f4c651..6553e2555 100644 --- a/include/cantera/equil/vcs_prob.h +++ b/include/cantera/equil/vcs_prob.h @@ -2,11 +2,9 @@ * @file vcs_prob.h * Header for the Interface class for the vcs thermo equilibrium solver package, */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef _VCS_PROB_H #define _VCS_PROB_H diff --git a/include/cantera/equil/vcs_solve.h b/include/cantera/equil/vcs_solve.h index eed8e91e2..a7765a851 100644 --- a/include/cantera/equil/vcs_solve.h +++ b/include/cantera/equil/vcs_solve.h @@ -3,11 +3,9 @@ * equilibrium problem (see Class \link Cantera::VCS_SOLVE * VCS_SOLVE\endlink and \ref equilfunctions ). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef _VCS_SOLVE_H #define _VCS_SOLVE_H diff --git a/include/cantera/equil/vcs_species_thermo.h b/include/cantera/equil/vcs_species_thermo.h index 772b032c1..8ab618594 100644 --- a/include/cantera/equil/vcs_species_thermo.h +++ b/include/cantera/equil/vcs_species_thermo.h @@ -1,10 +1,7 @@ //! @file vcs_species_thermo.h -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef VCS_SPECIES_THERMO_H #define VCS_SPECIES_THERMO_H diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h index f5d55460f..7e7a6eda0 100644 --- a/include/cantera/kinetics/AqueousKinetics.h +++ b/include/cantera/kinetics/AqueousKinetics.h @@ -3,7 +3,8 @@ * @ingroup chemkinetics */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_AQUEOUSKINETICS_H #define CT_AQUEOUSKINETICS_H diff --git a/include/cantera/kinetics/EdgeKinetics.h b/include/cantera/kinetics/EdgeKinetics.h index 1da38c4ca..629d3eb92 100644 --- a/include/cantera/kinetics/EdgeKinetics.h +++ b/include/cantera/kinetics/EdgeKinetics.h @@ -4,7 +4,9 @@ * @ingroup chemkinetics * @ingroup electrochem */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_EDGEKINETICS_H #define CT_EDGEKINETICS_H diff --git a/include/cantera/kinetics/FalloffFactory.h b/include/cantera/kinetics/FalloffFactory.h index 263d2bf38..2c6bcabaa 100644 --- a/include/cantera/kinetics/FalloffFactory.h +++ b/include/cantera/kinetics/FalloffFactory.h @@ -4,7 +4,9 @@ * that implement gas-phase kinetics (GasKinetics, GRI_30_Kinetics) * (see \ref falloffGroup and class \link Cantera::Falloff Falloff\endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_NEWFALLOFF_H #define CT_NEWFALLOFF_H diff --git a/include/cantera/kinetics/FalloffMgr.h b/include/cantera/kinetics/FalloffMgr.h index cf69f9af7..819e3794c 100644 --- a/include/cantera/kinetics/FalloffMgr.h +++ b/include/cantera/kinetics/FalloffMgr.h @@ -2,7 +2,8 @@ * @file FalloffMgr.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FALLOFFMGR_H #define CT_FALLOFFMGR_H diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h index f7378ded1..6d2284efd 100644 --- a/include/cantera/kinetics/GasKinetics.h +++ b/include/cantera/kinetics/GasKinetics.h @@ -3,7 +3,8 @@ * @ingroup chemkinetics */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_GASKINETICS_H #define CT_GASKINETICS_H diff --git a/include/cantera/kinetics/Group.h b/include/cantera/kinetics/Group.h index 454a847f8..dd6b73adf 100644 --- a/include/cantera/kinetics/Group.h +++ b/include/cantera/kinetics/Group.h @@ -2,7 +2,8 @@ * @file Group.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RXNPATH_GROUP #define CT_RXNPATH_GROUP diff --git a/include/cantera/kinetics/ImplicitSurfChem.h b/include/cantera/kinetics/ImplicitSurfChem.h index 2f39f2aac..bc8f57b33 100644 --- a/include/cantera/kinetics/ImplicitSurfChem.h +++ b/include/cantera/kinetics/ImplicitSurfChem.h @@ -4,7 +4,9 @@ * (see \ref kineticsmgr and class * \link Cantera::ImplicitSurfChem ImplicitSurfChem\endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IMPSURFCHEM_H #define CT_IMPSURFCHEM_H diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h index 671217cd5..7ae672438 100644 --- a/include/cantera/kinetics/InterfaceKinetics.h +++ b/include/cantera/kinetics/InterfaceKinetics.h @@ -2,7 +2,9 @@ * @file InterfaceKinetics.h * @ingroup chemkinetics */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IFACEKINETICS_H #define CT_IFACEKINETICS_H diff --git a/include/cantera/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h index ef7c506b3..a2190155e 100644 --- a/include/cantera/kinetics/Kinetics.h +++ b/include/cantera/kinetics/Kinetics.h @@ -5,7 +5,8 @@ * \link Cantera::Kinetics Kinetics\endlink). */ -// Copyright 2001-2004 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_KINETICS_H #define CT_KINETICS_H diff --git a/include/cantera/kinetics/KineticsFactory.h b/include/cantera/kinetics/KineticsFactory.h index a57244f3a..74a8793dd 100644 --- a/include/cantera/kinetics/KineticsFactory.h +++ b/include/cantera/kinetics/KineticsFactory.h @@ -1,8 +1,9 @@ /** * @file KineticsFactory.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef KINETICS_FACTORY_H #define KINETICS_FACTORY_H diff --git a/include/cantera/kinetics/RateCoeffMgr.h b/include/cantera/kinetics/RateCoeffMgr.h index 16988de27..5c21b3963 100644 --- a/include/cantera/kinetics/RateCoeffMgr.h +++ b/include/cantera/kinetics/RateCoeffMgr.h @@ -1,8 +1,9 @@ /** * @file RateCoeffMgr.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RATECOEFF_MGR_H #define CT_RATECOEFF_MGR_H diff --git a/include/cantera/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h index cca45846c..951ec8d72 100644 --- a/include/cantera/kinetics/ReactionPath.h +++ b/include/cantera/kinetics/ReactionPath.h @@ -3,7 +3,8 @@ * Classes for reaction path analysis. */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RXNPATH_H #define CT_RXNPATH_H diff --git a/include/cantera/kinetics/RxnRates.h b/include/cantera/kinetics/RxnRates.h index 6cec0b29c..7bd91e45e 100644 --- a/include/cantera/kinetics/RxnRates.h +++ b/include/cantera/kinetics/RxnRates.h @@ -1,7 +1,9 @@ /** * @file RxnRates.h */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RXNRATES_H #define CT_RXNRATES_H diff --git a/include/cantera/kinetics/StoichManager.h b/include/cantera/kinetics/StoichManager.h index 855d81599..1d628d14b 100644 --- a/include/cantera/kinetics/StoichManager.h +++ b/include/cantera/kinetics/StoichManager.h @@ -2,7 +2,8 @@ * @file StoichManager.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_STOICH_MGR_H #define CT_STOICH_MGR_H diff --git a/include/cantera/kinetics/importKinetics.h b/include/cantera/kinetics/importKinetics.h index 3bad662c8..5793550c3 100644 --- a/include/cantera/kinetics/importKinetics.h +++ b/include/cantera/kinetics/importKinetics.h @@ -9,7 +9,9 @@ * of these routines is to initialize the %Cantera objects with data * from the ctml tree structures. */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IMPORTKINETICS_H #define CT_IMPORTKINETICS_H diff --git a/include/cantera/kinetics/reaction_defs.h b/include/cantera/kinetics/reaction_defs.h index 5767d27b7..e73c64cfd 100644 --- a/include/cantera/kinetics/reaction_defs.h +++ b/include/cantera/kinetics/reaction_defs.h @@ -3,7 +3,8 @@ * This file defines some constants used to specify reaction types. */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RXN_DEFS_H #define CT_RXN_DEFS_H diff --git a/include/cantera/kinetics/solveSP.h b/include/cantera/kinetics/solveSP.h index b2b0ec3f4..9f95efc55 100644 --- a/include/cantera/kinetics/solveSP.h +++ b/include/cantera/kinetics/solveSP.h @@ -2,12 +2,9 @@ * @file solveSP.h Header file for implicit surface problem solver (see \ref * chemkinetics and class \link Cantera::solveSP solveSP\endlink). */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef SOLVESP_H #define SOLVESP_H diff --git a/include/cantera/numerics/BandMatrix.h b/include/cantera/numerics/BandMatrix.h index 26677218c..2da19202c 100644 --- a/include/cantera/numerics/BandMatrix.h +++ b/include/cantera/numerics/BandMatrix.h @@ -5,7 +5,8 @@ * (see class \ref numerics and \link Cantera::BandMatrix BandMatrix\endlink). */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_BANDMATRIX_H #define CT_BANDMATRIX_H diff --git a/include/cantera/numerics/CVodesIntegrator.h b/include/cantera/numerics/CVodesIntegrator.h index 307adbdd5..9357beaf8 100644 --- a/include/cantera/numerics/CVodesIntegrator.h +++ b/include/cantera/numerics/CVodesIntegrator.h @@ -1,7 +1,9 @@ /** * @file CVodesIntegrator.h */ -// Copyright 2005 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CVODESWRAPPER_H #define CT_CVODESWRAPPER_H diff --git a/include/cantera/numerics/DAE_Solver.h b/include/cantera/numerics/DAE_Solver.h index 53f647074..4302a261f 100644 --- a/include/cantera/numerics/DAE_Solver.h +++ b/include/cantera/numerics/DAE_Solver.h @@ -3,7 +3,8 @@ * Header file for class DAE_Solver */ -// Copyright 2006 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_DAE_Solver_H #define CT_DAE_Solver_H diff --git a/include/cantera/numerics/DenseMatrix.h b/include/cantera/numerics/DenseMatrix.h index 2ccea46a8..12c92ff74 100644 --- a/include/cantera/numerics/DenseMatrix.h +++ b/include/cantera/numerics/DenseMatrix.h @@ -5,7 +5,8 @@ * (see \ref numerics and \link Cantera::DenseMatrix DenseMatrix \endlink) . */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_DENSEMATRIX_H #define CT_DENSEMATRIX_H diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h index 8db78aa67..b5734981d 100644 --- a/include/cantera/numerics/Func1.h +++ b/include/cantera/numerics/Func1.h @@ -2,7 +2,8 @@ * @file Func1.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FUNC1_H #define CT_FUNC1_H diff --git a/include/cantera/numerics/FuncEval.h b/include/cantera/numerics/FuncEval.h index bf4994c05..845b33a7f 100644 --- a/include/cantera/numerics/FuncEval.h +++ b/include/cantera/numerics/FuncEval.h @@ -2,7 +2,8 @@ * @file FuncEval.h */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FUNCEVAL_H #define CT_FUNCEVAL_H diff --git a/include/cantera/numerics/GeneralMatrix.h b/include/cantera/numerics/GeneralMatrix.h index 195dbf608..a1a9aa49e 100644 --- a/include/cantera/numerics/GeneralMatrix.h +++ b/include/cantera/numerics/GeneralMatrix.h @@ -4,12 +4,8 @@ * (see class \ref numerics and \link Cantera::GeneralMatrix GeneralMatrix\endlink). */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_GENERALMATRIX_H #define CT_GENERALMATRIX_H diff --git a/include/cantera/numerics/IDA_Solver.h b/include/cantera/numerics/IDA_Solver.h index 84b0a5118..5b2fcfcbc 100644 --- a/include/cantera/numerics/IDA_Solver.h +++ b/include/cantera/numerics/IDA_Solver.h @@ -3,7 +3,8 @@ * Header file for class IDA_Solver */ -// Copyright 2006 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IDA_SOLVER_H #define CT_IDA_SOLVER_H diff --git a/include/cantera/numerics/Integrator.h b/include/cantera/numerics/Integrator.h index 6b2eb150a..31c7d7471 100644 --- a/include/cantera/numerics/Integrator.h +++ b/include/cantera/numerics/Integrator.h @@ -6,7 +6,8 @@ * @defgroup odeGroup ODE Integrators */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_INTEGRATOR_H #define CT_INTEGRATOR_H diff --git a/include/cantera/numerics/ResidEval.h b/include/cantera/numerics/ResidEval.h index 9f9ad7018..4385fa670 100644 --- a/include/cantera/numerics/ResidEval.h +++ b/include/cantera/numerics/ResidEval.h @@ -1,6 +1,7 @@ //! @file ResidEval.h -// Copyright 2006 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RESIDEVAL_H #define CT_RESIDEVAL_H diff --git a/include/cantera/numerics/ResidJacEval.h b/include/cantera/numerics/ResidJacEval.h index 786d93904..acee5df00 100644 --- a/include/cantera/numerics/ResidJacEval.h +++ b/include/cantera/numerics/ResidJacEval.h @@ -4,12 +4,8 @@ * Dense, Square (not sparse) matrices. */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RESIDJACEVAL_H #define CT_RESIDJACEVAL_H diff --git a/include/cantera/numerics/RootFind.h b/include/cantera/numerics/RootFind.h index 36bba96e6..02a380293 100644 --- a/include/cantera/numerics/RootFind.h +++ b/include/cantera/numerics/RootFind.h @@ -4,12 +4,8 @@ * Cantera::RootFind RootFind\endlink). */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_ROOTFIND_H #define CT_ROOTFIND_H diff --git a/include/cantera/numerics/SquareMatrix.h b/include/cantera/numerics/SquareMatrix.h index 1447cb070..b651ab364 100644 --- a/include/cantera/numerics/SquareMatrix.h +++ b/include/cantera/numerics/SquareMatrix.h @@ -1,11 +1,7 @@ //! @file SquareMatrix.h Dense, Square (not sparse) matrices. -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_SQUAREMATRIX_H #define CT_SQUAREMATRIX_H diff --git a/include/cantera/numerics/ctlapack.h b/include/cantera/numerics/ctlapack.h index aaacc53d1..ca17fb7f1 100644 --- a/include/cantera/numerics/ctlapack.h +++ b/include/cantera/numerics/ctlapack.h @@ -1,7 +1,9 @@ /** * @file ctlapack.h */ -// Copyright 2001 California Institute of Technology. + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CTLAPACK_H #define CT_CTLAPACK_H diff --git a/include/cantera/numerics/funcs.h b/include/cantera/numerics/funcs.h index 460956315..92138f49c 100644 --- a/include/cantera/numerics/funcs.h +++ b/include/cantera/numerics/funcs.h @@ -2,10 +2,10 @@ * @file funcs.h Header for a file containing miscellaneous * numerical functions. */ -/* - * Copyright 2001-2003 California Institute of Technology - * See file License.txt for licensing information - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_FUNCS_H #define CT_FUNCS_H diff --git a/include/cantera/numerics/polyfit.h b/include/cantera/numerics/polyfit.h index 588342362..d31d25b94 100644 --- a/include/cantera/numerics/polyfit.h +++ b/include/cantera/numerics/polyfit.h @@ -1,8 +1,7 @@ //! @file polyfit.h -/* - * Copyright 2001-2003 California Institute of Technology - * See file License.txt for licensing information - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_POLYFIT_H #define CT_POLYFIT_H diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index 1c8d4d704..a1d67d97f 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -1,8 +1,7 @@ //! @file Domain1D.h -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_DOMAIN1D_H #define CT_DOMAIN1D_H diff --git a/include/cantera/oneD/Inlet1D.h b/include/cantera/oneD/Inlet1D.h index 7b94a7e33..f5aa6fa88 100644 --- a/include/cantera/oneD/Inlet1D.h +++ b/include/cantera/oneD/Inlet1D.h @@ -4,9 +4,8 @@ * Boundary objects for one-dimensional simulations. */ -/* - * Copyright 2002-3 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_BDRY1D_H #define CT_BDRY1D_H diff --git a/include/cantera/oneD/MultiJac.h b/include/cantera/oneD/MultiJac.h index d82c9c38d..3cfcdab74 100644 --- a/include/cantera/oneD/MultiJac.h +++ b/include/cantera/oneD/MultiJac.h @@ -1,8 +1,7 @@ //! @file MultiJac.h -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MULTIJAC_H #define CT_MULTIJAC_H diff --git a/include/cantera/oneD/MultiNewton.h b/include/cantera/oneD/MultiNewton.h index eb3d6b26b..11a872c23 100644 --- a/include/cantera/oneD/MultiNewton.h +++ b/include/cantera/oneD/MultiNewton.h @@ -1,8 +1,7 @@ //! @file MultiNewton.h -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MULTINEWTON_H #define CT_MULTINEWTON_H diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h index b8b579f17..b2950461c 100644 --- a/include/cantera/oneD/StFlow.h +++ b/include/cantera/oneD/StFlow.h @@ -1,6 +1,7 @@ //! @file StFlow.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_STFLOW_H #define CT_STFLOW_H diff --git a/include/cantera/thermo/AdsorbateThermo.h b/include/cantera/thermo/AdsorbateThermo.h index 8b6de069a..9f83cae1c 100644 --- a/include/cantera/thermo/AdsorbateThermo.h +++ b/include/cantera/thermo/AdsorbateThermo.h @@ -6,7 +6,9 @@ * expressions for the thermo properties of a species with several vibrational * models. */ -// Copyright 2007 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_ADSORBATE_H #define CT_ADSORBATE_H diff --git a/include/cantera/thermo/ConstCpPoly.h b/include/cantera/thermo/ConstCpPoly.h index 9b400f315..24483cc29 100644 --- a/include/cantera/thermo/ConstCpPoly.h +++ b/include/cantera/thermo/ConstCpPoly.h @@ -4,7 +4,9 @@ * object that employs a constant heat capacity assumption (see \ref spthermo and * \link Cantera::ConstCpPoly ConstCpPoly\endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CONSTCPPOLY_H #define CT_CONSTCPPOLY_H diff --git a/include/cantera/thermo/ConstDensityThermo.h b/include/cantera/thermo/ConstDensityThermo.h index 7857da5f6..c154bbf01 100644 --- a/include/cantera/thermo/ConstDensityThermo.h +++ b/include/cantera/thermo/ConstDensityThermo.h @@ -3,9 +3,9 @@ * Header for a Thermo manager for incompressible ThermoPhases * (see \ref thermoprops and \link Cantera::ConstDensityThermo ConstDensityThermo\endlink). */ -/* - * Copyright 2002 California Institute of Technology - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CONSTRHOTHERMO_H #define CT_CONSTRHOTHERMO_H diff --git a/include/cantera/thermo/DebyeHuckel.h b/include/cantera/thermo/DebyeHuckel.h index e8e984776..d99b7688c 100644 --- a/include/cantera/thermo/DebyeHuckel.h +++ b/include/cantera/thermo/DebyeHuckel.h @@ -8,11 +8,9 @@ * obeys the Debye Huckel formulation for nonideality. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_DEBYEHUCKEL_H #define CT_DEBYEHUCKEL_H diff --git a/include/cantera/thermo/EdgePhase.h b/include/cantera/thermo/EdgePhase.h index 0cd4004a4..00bd8f610 100644 --- a/include/cantera/thermo/EdgePhase.h +++ b/include/cantera/thermo/EdgePhase.h @@ -4,7 +4,8 @@ * \link Cantera::EdgePhase EdgePhase\endlink). */ -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_EDGEPHASE_H #define CT_EDGEPHASE_H diff --git a/include/cantera/thermo/Elements.h b/include/cantera/thermo/Elements.h index a79aacc87..d45893388 100644 --- a/include/cantera/thermo/Elements.h +++ b/include/cantera/thermo/Elements.h @@ -3,7 +3,9 @@ * Contains the getElementWeight function and the definitions of element * constraint types. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_ELEMENTS_H #define CT_ELEMENTS_H diff --git a/include/cantera/thermo/FixedChemPotSSTP.h b/include/cantera/thermo/FixedChemPotSSTP.h index 215c299ff..402487780 100644 --- a/include/cantera/thermo/FixedChemPotSSTP.h +++ b/include/cantera/thermo/FixedChemPotSSTP.h @@ -5,11 +5,8 @@ * class \link Cantera::FixedChemPotSSTP FixedChemPotSSTP\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FIXEDCHEMPOTSSTP_H #define CT_FIXEDCHEMPOTSSTP_H diff --git a/include/cantera/thermo/GibbsExcessVPSSTP.h b/include/cantera/thermo/GibbsExcessVPSSTP.h index ca0e68bed..ed7367369 100644 --- a/include/cantera/thermo/GibbsExcessVPSSTP.h +++ b/include/cantera/thermo/GibbsExcessVPSSTP.h @@ -5,11 +5,10 @@ * (see \ref thermoprops * and class \link Cantera::GibbsExcessVPSSTP GibbsExcessVPSSTP\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_GIBBSEXCESSVPSSTP_H #define CT_GIBBSEXCESSVPSSTP_H diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h index dfe578247..9d8f5da81 100644 --- a/include/cantera/thermo/HMWSoln.h +++ b/include/cantera/thermo/HMWSoln.h @@ -8,11 +8,10 @@ * obeys the Pitzer formulation for nonideality using molality-based * standard states. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_HMWSOLN_H #define CT_HMWSOLN_H diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h index 6b274004f..0ec41ced7 100644 --- a/include/cantera/thermo/IdealGasPhase.h +++ b/include/cantera/thermo/IdealGasPhase.h @@ -5,7 +5,9 @@ * and class \link Cantera::IdealGasPhase IdealGasPhase\endlink). */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_IDEALGASPHASE_H #define CT_IDEALGASPHASE_H diff --git a/include/cantera/thermo/IdealMolalSoln.h b/include/cantera/thermo/IdealMolalSoln.h index ab4e5383e..72e65001f 100644 --- a/include/cantera/thermo/IdealMolalSoln.h +++ b/include/cantera/thermo/IdealMolalSoln.h @@ -11,11 +11,10 @@ * turns out to be highly nonlinear in the limit of the solvent mole fraction * going to zero. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_IDEALMOLALSOLN_H #define CT_IDEALMOLALSOLN_H diff --git a/include/cantera/thermo/IdealSolidSolnPhase.h b/include/cantera/thermo/IdealSolidSolnPhase.h index 82a5f6169..8f7283203 100644 --- a/include/cantera/thermo/IdealSolidSolnPhase.h +++ b/include/cantera/thermo/IdealSolidSolnPhase.h @@ -6,11 +6,9 @@ * This class inherits from the Cantera class ThermoPhase and implements an * ideal solid solution model with incompressible thermodynamics. */ -/* - * Copyright 2006 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000, with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IDEALSOLIDSOLNPHASE_H #define CT_IDEALSOLIDSOLNPHASE_H diff --git a/include/cantera/thermo/IdealSolnGasVPSS.h b/include/cantera/thermo/IdealSolnGasVPSS.h index bc88328f4..0a205f7f6 100644 --- a/include/cantera/thermo/IdealSolnGasVPSS.h +++ b/include/cantera/thermo/IdealSolnGasVPSS.h @@ -6,11 +6,10 @@ * thermodynamic properties (see \ref thermoprops and * class \link Cantera::IdealSolnGasVPSS IdealSolnGasVPSS\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_IDEALSOLNGASVPSS_H #define CT_IDEALSOLNGASVPSS_H diff --git a/include/cantera/thermo/IonsFromNeutralVPSSTP.h b/include/cantera/thermo/IonsFromNeutralVPSSTP.h index 43279a0d0..e8b64ad94 100644 --- a/include/cantera/thermo/IonsFromNeutralVPSSTP.h +++ b/include/cantera/thermo/IonsFromNeutralVPSSTP.h @@ -4,11 +4,10 @@ * neutral molecule thermodynamics. (see \ref thermoprops and class \link * Cantera::IonsFromNeutralVPSSTP IonsFromNeutralVPSSTP\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_IONSFROMNEUTRALVPSSTP_H #define CT_IONSFROMNEUTRALVPSSTP_H diff --git a/include/cantera/thermo/LatticePhase.h b/include/cantera/thermo/LatticePhase.h index 99bb3d436..fa56bd011 100644 --- a/include/cantera/thermo/LatticePhase.h +++ b/include/cantera/thermo/LatticePhase.h @@ -5,7 +5,8 @@ * LatticePhase\endlink). */ -// Copyright 2005 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_LATTICE_H #define CT_LATTICE_H diff --git a/include/cantera/thermo/LatticeSolidPhase.h b/include/cantera/thermo/LatticeSolidPhase.h index 429e45965..abfbe7f7a 100644 --- a/include/cantera/thermo/LatticeSolidPhase.h +++ b/include/cantera/thermo/LatticeSolidPhase.h @@ -5,7 +5,8 @@ * Cantera::LatticeSolidPhase LatticeSolidPhase\endlink). */ -// Copyright 2005 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_LATTICESOLID_H #define CT_LATTICESOLID_H diff --git a/include/cantera/thermo/MargulesVPSSTP.h b/include/cantera/thermo/MargulesVPSSTP.h index 709025a3b..dc92137d5 100644 --- a/include/cantera/thermo/MargulesVPSSTP.h +++ b/include/cantera/thermo/MargulesVPSSTP.h @@ -2,11 +2,10 @@ * @file MargulesVPSSTP.h (see \ref thermoprops and class \link * Cantera::MargulesVPSSTP MargulesVPSSTP\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_MARGULESVPSSTP_H #define CT_MARGULESVPSSTP_H diff --git a/include/cantera/thermo/MaskellSolidSolnPhase.h b/include/cantera/thermo/MaskellSolidSolnPhase.h index 67b0a3b10..4083a0a01 100644 --- a/include/cantera/thermo/MaskellSolidSolnPhase.h +++ b/include/cantera/thermo/MaskellSolidSolnPhase.h @@ -5,11 +5,9 @@ * This class inherits from the Cantera class ThermoPhase and implements a * non-ideal solid solution model with incompressible thermodynamics. */ -/* - * Copyright 2006 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000, with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MASKELLSOLIDSOLNPHASE_H #define CT_MASKELLSOLIDSOLNPHASE_H diff --git a/include/cantera/thermo/MetalPhase.h b/include/cantera/thermo/MetalPhase.h index d6867f21b..610c80c5a 100644 --- a/include/cantera/thermo/MetalPhase.h +++ b/include/cantera/thermo/MetalPhase.h @@ -2,7 +2,8 @@ * @file MetalPhase.h */ -// Copyright 2003 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_METALPHASE_H #define CT_METALPHASE_H diff --git a/include/cantera/thermo/MetalSHEelectrons.h b/include/cantera/thermo/MetalSHEelectrons.h index b7808ec26..60b8ae051 100644 --- a/include/cantera/thermo/MetalSHEelectrons.h +++ b/include/cantera/thermo/MetalSHEelectrons.h @@ -6,11 +6,9 @@ * class \link Cantera::MetalSHEelectrons MetalSHEelectrons\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_METALSHEELECTRONS_H #define CT_METALSHEELECTRONS_H diff --git a/include/cantera/thermo/MineralEQ3.h b/include/cantera/thermo/MineralEQ3.h index 0378b423f..9d754a7c2 100644 --- a/include/cantera/thermo/MineralEQ3.h +++ b/include/cantera/thermo/MineralEQ3.h @@ -5,13 +5,9 @@ * class \link Cantera::MineralEQ3 MineralEQ3\endlink) */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - * - * Copyright 2001 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_MINERALEQ3_H #define CT_MINERALEQ3_H diff --git a/include/cantera/thermo/MixedSolventElectrolyte.h b/include/cantera/thermo/MixedSolventElectrolyte.h index 6ceb03236..153a19f8d 100644 --- a/include/cantera/thermo/MixedSolventElectrolyte.h +++ b/include/cantera/thermo/MixedSolventElectrolyte.h @@ -2,11 +2,9 @@ * @file MixedSolventElectrolyte.h (see \ref thermoprops and class \link * Cantera::MixedSolventElectrolyte MixedSolventElectrolyte \endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MIXEDSOLVENTELECTROLYTEVPSSTP_H #define CT_MIXEDSOLVENTELECTROLYTEVPSSTP_H diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h index 795b2ffa4..92fda34fd 100644 --- a/include/cantera/thermo/MixtureFugacityTP.h +++ b/include/cantera/thermo/MixtureFugacityTP.h @@ -4,11 +4,9 @@ * non-ideal mixtures based on the fugacity models (see \ref thermoprops and * class \link Cantera::MixtureFugacityTP MixtureFugacityTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MIXTUREFUGACITYTP_H #define CT_MIXTUREFUGACITYTP_H diff --git a/include/cantera/thermo/MolalityVPSSTP.h b/include/cantera/thermo/MolalityVPSSTP.h index 5281d9976..f9b5c2580 100644 --- a/include/cantera/thermo/MolalityVPSSTP.h +++ b/include/cantera/thermo/MolalityVPSSTP.h @@ -11,11 +11,10 @@ * based on the molality scale. These include most of the methods for * calculating liquid electrolyte thermodynamics. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_MOLALITYVPSSTP_H #define CT_MOLALITYVPSSTP_H diff --git a/include/cantera/thermo/MolarityIonicVPSSTP.h b/include/cantera/thermo/MolarityIonicVPSSTP.h index e53c7a97e..2ff34cec4 100644 --- a/include/cantera/thermo/MolarityIonicVPSSTP.h +++ b/include/cantera/thermo/MolarityIonicVPSSTP.h @@ -7,11 +7,9 @@ * further based upon activities based on the molarity scale. In this class, we * expect that there are ions, but they are treated on the molarity scale. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MOLARITYIONICVPSSTP_H #define CT_MOLARITYIONICVPSSTP_H diff --git a/include/cantera/thermo/Nasa9Poly1.h b/include/cantera/thermo/Nasa9Poly1.h index 4f32ce9e4..2c52989aa 100644 --- a/include/cantera/thermo/Nasa9Poly1.h +++ b/include/cantera/thermo/Nasa9Poly1.h @@ -7,11 +7,9 @@ * * This parameterization has one NASA temperature region. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_NASA9POLY1_H #define CT_NASA9POLY1_H diff --git a/include/cantera/thermo/Nasa9PolyMultiTempRegion.h b/include/cantera/thermo/Nasa9PolyMultiTempRegion.h index e39897732..1f0269c64 100644 --- a/include/cantera/thermo/Nasa9PolyMultiTempRegion.h +++ b/include/cantera/thermo/Nasa9PolyMultiTempRegion.h @@ -10,9 +10,11 @@ * This parameterization has multiple NASA temperature regions. */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_NASA9POLYMULTITEMPREGION_H #define CT_NASA9POLYMULTITEMPREGION_H -// Copyright 2007 Sandia National Laboratories #include "cantera/thermo/Nasa9Poly1.h" diff --git a/include/cantera/thermo/NasaPoly1.h b/include/cantera/thermo/NasaPoly1.h index 10ad1f515..131f2210e 100644 --- a/include/cantera/thermo/NasaPoly1.h +++ b/include/cantera/thermo/NasaPoly1.h @@ -8,9 +8,11 @@ * This parameterization has one NASA temperature region. */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_NASAPOLY1_H #define CT_NASAPOLY1_H -// Copyright 2001 California Institute of Technology #include "SpeciesThermoInterpType.h" diff --git a/include/cantera/thermo/NasaPoly2.h b/include/cantera/thermo/NasaPoly2.h index 15f1b5d28..f22e277f6 100644 --- a/include/cantera/thermo/NasaPoly2.h +++ b/include/cantera/thermo/NasaPoly2.h @@ -7,7 +7,9 @@ * * Two zoned NASA polynomial parameterization */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_NASAPOLY2_H #define CT_NASAPOLY2_H diff --git a/include/cantera/thermo/PDSS.h b/include/cantera/thermo/PDSS.h index 89c35be35..667c9cbb1 100644 --- a/include/cantera/thermo/PDSS.h +++ b/include/cantera/thermo/PDSS.h @@ -4,11 +4,10 @@ * which handles calculations for a single species in a phase * (see \ref pdssthermo and class \link Cantera::PDSS PDSS\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_PDSS_H #define CT_PDSS_H #include "cantera/base/ct_defs.h" diff --git a/include/cantera/thermo/PDSS_ConstVol.h b/include/cantera/thermo/PDSS_ConstVol.h index 2d5d7723c..e1c58eb6d 100644 --- a/include/cantera/thermo/PDSS_ConstVol.h +++ b/include/cantera/thermo/PDSS_ConstVol.h @@ -4,11 +4,10 @@ * which handles calculations for a single species with a constant molar volume in a phase * (see class \ref pdssthermo and \link Cantera::PDSS_ConstVol PDSS_ConstVol\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_PDSS_CONSTVOL_H #define CT_PDSS_CONSTVOL_H diff --git a/include/cantera/thermo/PDSS_HKFT.h b/include/cantera/thermo/PDSS_HKFT.h index 509c13eeb..b545714a2 100644 --- a/include/cantera/thermo/PDSS_HKFT.h +++ b/include/cantera/thermo/PDSS_HKFT.h @@ -5,11 +5,9 @@ * HKFT standard state * (see \ref pdssthermo and class \link Cantera::PDSS_HKFT PDSS_HKFT\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_PDSS_HKFT_H #define CT_PDSS_HKFT_H diff --git a/include/cantera/thermo/PDSS_IdealGas.h b/include/cantera/thermo/PDSS_IdealGas.h index 3673bf8dc..96b9c00bd 100644 --- a/include/cantera/thermo/PDSS_IdealGas.h +++ b/include/cantera/thermo/PDSS_IdealGas.h @@ -4,11 +4,10 @@ * which handles calculations for a single ideal gas species in a phase * (see \ref pdssthermo and class \link Cantera::PDSS_IdealGas PDSS_IdealGas\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_PDSS_IDEALGAS_H #define CT_PDSS_IDEALGAS_H diff --git a/include/cantera/thermo/PDSS_IonsFromNeutral.h b/include/cantera/thermo/PDSS_IonsFromNeutral.h index 845a3a8d6..f3af507b2 100644 --- a/include/cantera/thermo/PDSS_IonsFromNeutral.h +++ b/include/cantera/thermo/PDSS_IonsFromNeutral.h @@ -5,11 +5,10 @@ * are calculated from another neutral molecule. * (see \ref pdssthermo and class \link Cantera::PDSS_IonsFromNeutral PDSS_IonsFromNeutral\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_PDSS_IONSFROMNEUTRAL_H #define CT_PDSS_IONSFROMNEUTRAL_H diff --git a/include/cantera/thermo/PDSS_SSVol.h b/include/cantera/thermo/PDSS_SSVol.h index c01703475..a16c859aa 100644 --- a/include/cantera/thermo/PDSS_SSVol.h +++ b/include/cantera/thermo/PDSS_SSVol.h @@ -5,11 +5,10 @@ * given by an enumerated data type * (see class \ref pdssthermo and \link Cantera::PDSS_SSVol PDSS_SSVol\endlink). */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_PDSS_SSVOL_H #define CT_PDSS_SSVOL_H diff --git a/include/cantera/thermo/PDSS_Water.h b/include/cantera/thermo/PDSS_Water.h index 6d94d248d..291d42ad0 100644 --- a/include/cantera/thermo/PDSS_Water.h +++ b/include/cantera/thermo/PDSS_Water.h @@ -4,11 +4,10 @@ * virtual function for a Pure Water Phase * (see \ref pdssthermo and class \link Cantera::PDSS_Water PDSS_Water\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_PDSS_WATER_H #define CT_PDSS_WATER_H diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h index 2246240d1..9635b9479 100644 --- a/include/cantera/thermo/Phase.h +++ b/include/cantera/thermo/Phase.h @@ -2,7 +2,9 @@ * @file Phase.h * Header file for class Phase. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_PHASE_H #define CT_PHASE_H diff --git a/include/cantera/thermo/PhaseCombo_Interaction.h b/include/cantera/thermo/PhaseCombo_Interaction.h index d2fb1b0c1..b438acc10 100644 --- a/include/cantera/thermo/PhaseCombo_Interaction.h +++ b/include/cantera/thermo/PhaseCombo_Interaction.h @@ -6,11 +6,8 @@ * 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. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_PHASECOMBO_INTERACTION_H #define CT_PHASECOMBO_INTERACTION_H diff --git a/include/cantera/thermo/PureFluidPhase.h b/include/cantera/thermo/PureFluidPhase.h index 43fadc281..7b6d56910 100644 --- a/include/cantera/thermo/PureFluidPhase.h +++ b/include/cantera/thermo/PureFluidPhase.h @@ -8,7 +8,8 @@ * It inherits from ThermoPhase, but is built on top of the tpx package. */ -// Copyright 2003 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_EOS_TPX_H #define CT_EOS_TPX_H diff --git a/include/cantera/thermo/RedlichKisterVPSSTP.h b/include/cantera/thermo/RedlichKisterVPSSTP.h index 694bb9bc4..499745a5b 100644 --- a/include/cantera/thermo/RedlichKisterVPSSTP.h +++ b/include/cantera/thermo/RedlichKisterVPSSTP.h @@ -2,11 +2,9 @@ * @file RedlichKisterVPSSTP.h (see \ref thermoprops and class \link * Cantera::RedlichKisterVPSSTP RedlichKisterVPSSTP\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_REDLICHKISTERVPSSTP_H #define CT_REDLICHKISTERVPSSTP_H diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h index 7e06b9b06..2184cea6f 100644 --- a/include/cantera/thermo/RedlichKwongMFTP.h +++ b/include/cantera/thermo/RedlichKwongMFTP.h @@ -1,10 +1,7 @@ //! @file RedlichKwongMFTP.h -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_REDLICHKWONGMFTP_H #define CT_REDLICHKWONGMFTP_H diff --git a/include/cantera/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h index b0030d97f..37ce3b6f7 100644 --- a/include/cantera/thermo/SemiconductorPhase.h +++ b/include/cantera/thermo/SemiconductorPhase.h @@ -2,7 +2,8 @@ * @file SemiconductorPhase.h */ -// Copyright 2003 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_SEMICONDPHASE_H #define CT_SEMICONDPHASE_H diff --git a/include/cantera/thermo/ShomatePoly.h b/include/cantera/thermo/ShomatePoly.h index 5f55a32d8..afd920291 100644 --- a/include/cantera/thermo/ShomatePoly.h +++ b/include/cantera/thermo/ShomatePoly.h @@ -7,7 +7,9 @@ * \link Cantera::ShomatePoly2 ShomatePoly2\endlink). * Shomate polynomial expressions. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_SHOMATEPOLY1_H #define CT_SHOMATEPOLY1_H diff --git a/include/cantera/thermo/SingleSpeciesTP.h b/include/cantera/thermo/SingleSpeciesTP.h index 19e072616..b35ee6493 100644 --- a/include/cantera/thermo/SingleSpeciesTP.h +++ b/include/cantera/thermo/SingleSpeciesTP.h @@ -4,11 +4,10 @@ * that eases the construction of single species phases * ( see \ref thermoprops and class \link Cantera::SingleSpeciesTP SingleSpeciesTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_SINGLESPECIESTP_H #define CT_SINGLESPECIESTP_H diff --git a/include/cantera/thermo/SpeciesThermoFactory.h b/include/cantera/thermo/SpeciesThermoFactory.h index e08f9c297..6e1fe1b55 100644 --- a/include/cantera/thermo/SpeciesThermoFactory.h +++ b/include/cantera/thermo/SpeciesThermoFactory.h @@ -4,7 +4,9 @@ * standard-state thermodynamic properties of a set of species * (see \ref spthermo); */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef SPECIESTHERMO_FACTORY_H #define SPECIESTHERMO_FACTORY_H diff --git a/include/cantera/thermo/SpeciesThermoInterpType.h b/include/cantera/thermo/SpeciesThermoInterpType.h index 1d003db92..b8f939fbd 100644 --- a/include/cantera/thermo/SpeciesThermoInterpType.h +++ b/include/cantera/thermo/SpeciesThermoInterpType.h @@ -6,7 +6,8 @@ * Cantera::SpeciesThermoInterpType SpeciesThermoInterpType \endlink). */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_SPECIESTHERMOINTERPTYPE_H #define CT_SPECIESTHERMOINTERPTYPE_H diff --git a/include/cantera/thermo/StoichSubstance.h b/include/cantera/thermo/StoichSubstance.h index be9bdaefd..141256039 100644 --- a/include/cantera/thermo/StoichSubstance.h +++ b/include/cantera/thermo/StoichSubstance.h @@ -5,11 +5,9 @@ * class \link Cantera::StoichSubstance StoichSubstance\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_STOICHSUBSTANCE_H #define CT_STOICHSUBSTANCE_H diff --git a/include/cantera/thermo/SurfPhase.h b/include/cantera/thermo/SurfPhase.h index 6ab818f68..debe78135 100644 --- a/include/cantera/thermo/SurfPhase.h +++ b/include/cantera/thermo/SurfPhase.h @@ -6,7 +6,8 @@ * (see \ref thermoprops and class \link Cantera::SurfPhase SurfPhase\endlink). */ -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_SURFPHASE_H #define CT_SURFPHASE_H diff --git a/include/cantera/thermo/ThermoFactory.h b/include/cantera/thermo/ThermoFactory.h index 28591ead1..7d4b78fb8 100644 --- a/include/cantera/thermo/ThermoFactory.h +++ b/include/cantera/thermo/ThermoFactory.h @@ -3,7 +3,9 @@ * Headers for the factory class that can create known ThermoPhase objects * (see \ref thermoprops and class \link Cantera::ThermoFactory ThermoFactory\endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef THERMO_FACTORY_H #define THERMO_FACTORY_H diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h index e515e0516..8c42027a4 100644 --- a/include/cantera/thermo/ThermoPhase.h +++ b/include/cantera/thermo/ThermoPhase.h @@ -5,7 +5,8 @@ * (see \ref thermoprops and class \link Cantera::ThermoPhase ThermoPhase\endlink). */ -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_THERMOPHASE_H #define CT_THERMOPHASE_H diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h index 4dd2c3761..2906a6ce4 100644 --- a/include/cantera/thermo/VPSSMgr.h +++ b/include/cantera/thermo/VPSSMgr.h @@ -6,11 +6,9 @@ * (see \ref mgrpdssthermocalc and * class \link Cantera::VPSSMgr VPSSMgr\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_VPSSMGR_H #define CT_VPSSMGR_H diff --git a/include/cantera/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h index c87748634..5edbce045 100644 --- a/include/cantera/thermo/VPSSMgr_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_ConstVol.h @@ -5,11 +5,9 @@ * states assuming constant volume (see class * \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol \endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_VPSSMGR_CONSTVOL_H #define CT_VPSSMGR_CONSTVOL_H diff --git a/include/cantera/thermo/VPSSMgr_General.h b/include/cantera/thermo/VPSSMgr_General.h index 772cc97d3..19972ba32 100644 --- a/include/cantera/thermo/VPSSMgr_General.h +++ b/include/cantera/thermo/VPSSMgr_General.h @@ -6,11 +6,9 @@ * but slow way (see \ref mgrpdssthermocalc and * class \link Cantera::VPSSMgr_General VPSSMgr_General\endlink). */ -/* - * Copyright (2007) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_VPSSMGR_GENERAL_H #define CT_VPSSMGR_GENERAL_H diff --git a/include/cantera/thermo/VPSSMgr_IdealGas.h b/include/cantera/thermo/VPSSMgr_IdealGas.h index b1f2935be..ebcdd6ba3 100644 --- a/include/cantera/thermo/VPSSMgr_IdealGas.h +++ b/include/cantera/thermo/VPSSMgr_IdealGas.h @@ -6,11 +6,9 @@ * (see \ref mgrpdssthermocalc and * class \link Cantera::VPSSMgr_IdealGas VPSSMgr_IdealGas\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_VPSSMGR_IDEALGAS_H #define CT_VPSSMGR_IDEALGAS_H diff --git a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h index d7be6cdf5..c8dc5e497 100644 --- a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h +++ b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h @@ -7,11 +7,9 @@ * (see \ref mgrpdssthermocalc and * class \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_VPSSMGR_WATER_CONSTVOL_H #define CT_VPSSMGR_WATER_CONSTVOL_H diff --git a/include/cantera/thermo/VPSSMgr_Water_HKFT.h b/include/cantera/thermo/VPSSMgr_Water_HKFT.h index 543db0d76..11c35c61a 100644 --- a/include/cantera/thermo/VPSSMgr_Water_HKFT.h +++ b/include/cantera/thermo/VPSSMgr_Water_HKFT.h @@ -6,11 +6,9 @@ * (see \ref mgrpdssthermocalc and * class \link Cantera::VPSSMgr_Water_HKFT VPSSMgr_Water_HKFT\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_VPSSMGR_WATER_HKFT_H #define CT_VPSSMGR_WATER_HKFT_H diff --git a/include/cantera/thermo/VPStandardStateTP.h b/include/cantera/thermo/VPStandardStateTP.h index 0ca82b1f9..45cace3dd 100644 --- a/include/cantera/thermo/VPStandardStateTP.h +++ b/include/cantera/thermo/VPStandardStateTP.h @@ -5,11 +5,10 @@ * thermodynamic properties (see \ref thermoprops and * class \link Cantera::VPStandardStateTP VPStandardStateTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_VPSTANDARDSTATETP_H #define CT_VPSTANDARDSTATETP_H diff --git a/include/cantera/thermo/WaterProps.h b/include/cantera/thermo/WaterProps.h index 2ca03f56c..cd9962962 100644 --- a/include/cantera/thermo/WaterProps.h +++ b/include/cantera/thermo/WaterProps.h @@ -5,11 +5,10 @@ * (see \ref thermoprops * and class \link Cantera::WaterProps WaterProps\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_WATERPROPS_H #define CT_WATERPROPS_H diff --git a/include/cantera/thermo/WaterPropsIAPWS.h b/include/cantera/thermo/WaterPropsIAPWS.h index 6da9c250c..428dbc18d 100644 --- a/include/cantera/thermo/WaterPropsIAPWS.h +++ b/include/cantera/thermo/WaterPropsIAPWS.h @@ -4,11 +4,10 @@ * from the IAPWS 1995 Formulation based on the steam tables thermodynamic * basis (See class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef WATERPROPSIAPWS_H #define WATERPROPSIAPWS_H diff --git a/include/cantera/thermo/WaterPropsIAPWSphi.h b/include/cantera/thermo/WaterPropsIAPWSphi.h index bcf598ce6..f4fb86629 100644 --- a/include/cantera/thermo/WaterPropsIAPWSphi.h +++ b/include/cantera/thermo/WaterPropsIAPWSphi.h @@ -6,11 +6,10 @@ * * This class calculates dimensionless quantities. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef WATERPROPSIAPWSPHI_H #define WATERPROPSIAPWSPHI_H diff --git a/include/cantera/thermo/WaterSSTP.h b/include/cantera/thermo/WaterSSTP.h index 5eb361e18..d70391da2 100644 --- a/include/cantera/thermo/WaterSSTP.h +++ b/include/cantera/thermo/WaterSSTP.h @@ -3,11 +3,10 @@ * Declares a ThermoPhase class consisting of pure water (see \ref thermoprops * and class \link Cantera::WaterSSTP WaterSSTP\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_WATERSSTP_H #define CT_WATERSSTP_H diff --git a/include/cantera/thermo/electrolytes.h b/include/cantera/thermo/electrolytes.h index f523a39d5..eb3e72850 100644 --- a/include/cantera/thermo/electrolytes.h +++ b/include/cantera/thermo/electrolytes.h @@ -4,11 +4,10 @@ * Header file for a common definitions used in electrolytes * thermodynamics. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #ifndef CT_ELECTROLYTES_H #define CT_ELECTROLYTES_H namespace Cantera diff --git a/include/cantera/thermo/speciesThermoTypes.h b/include/cantera/thermo/speciesThermoTypes.h index 65d55e5c6..34070204b 100644 --- a/include/cantera/thermo/speciesThermoTypes.h +++ b/include/cantera/thermo/speciesThermoTypes.h @@ -2,7 +2,9 @@ * @file speciesThermoTypes.h Contains const definitions for types of species * reference-state thermodynamics managers (see \ref spthermo) */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef SPECIES_THERMO_TYPES_H #define SPECIES_THERMO_TYPES_H diff --git a/include/cantera/transport/DustyGasTransport.h b/include/cantera/transport/DustyGasTransport.h index 8abb7a6b7..629660b60 100644 --- a/include/cantera/transport/DustyGasTransport.h +++ b/include/cantera/transport/DustyGasTransport.h @@ -5,7 +5,8 @@ * DustyGasTransport \endlink) . */ -// Copyright 2003 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_DUSTYGASTRAN_H #define CT_DUSTYGASTRAN_H diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index df9985f8d..001f5aad8 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -5,7 +5,8 @@ * (see \ref tranprops and \link Cantera::MixTransport MixTransport \endlink) . */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MIXTRAN_H #define CT_MIXTRAN_H diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h index dceb187fd..54dec008f 100644 --- a/include/cantera/transport/MultiTransport.h +++ b/include/cantera/transport/MultiTransport.h @@ -3,7 +3,8 @@ * Interface for class MultiTransport */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MULTITRAN_H #define CT_MULTITRAN_H diff --git a/include/cantera/transport/SolidTransport.h b/include/cantera/transport/SolidTransport.h index f30ea3af2..974cce149 100644 --- a/include/cantera/transport/SolidTransport.h +++ b/include/cantera/transport/SolidTransport.h @@ -5,7 +5,8 @@ * (see \ref tranprops and \link Cantera::SolidTransport SolidTransport \endlink). */ -// Copyright 2003 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_SOLIDTRAN_H #define CT_SOLIDTRAN_H diff --git a/include/cantera/transport/Tortuosity.h b/include/cantera/transport/Tortuosity.h index df65a991b..32ac82ca8 100644 --- a/include/cantera/transport/Tortuosity.h +++ b/include/cantera/transport/Tortuosity.h @@ -4,11 +4,8 @@ * assuming the Bruggeman exponent relation */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_TORTUOSITY_H #define CT_TORTUOSITY_H diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h index d6b073421..0d9744f8a 100644 --- a/include/cantera/transport/TransportBase.h +++ b/include/cantera/transport/TransportBase.h @@ -4,7 +4,9 @@ * tranprops group definition (see \ref tranprops and \link * Cantera::Transport Transport \endlink) . */ -// Copyright 2001-2003 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. /** * @defgroup tranprops Transport Properties for Species in Phases diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h index 4a79ffc12..d5fbb553a 100644 --- a/include/cantera/transport/TransportFactory.h +++ b/include/cantera/transport/TransportFactory.h @@ -3,7 +3,9 @@ * Header file defining class TransportFactory * (see \link Cantera::TransportFactory TransportFactory\endlink) */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_TRANSPORTFACTORY_H #define CT_TRANSPORTFACTORY_H diff --git a/include/cantera/zeroD/ConstPressureReactor.h b/include/cantera/zeroD/ConstPressureReactor.h index 4c5c896b3..a374f90b3 100644 --- a/include/cantera/zeroD/ConstPressureReactor.h +++ b/include/cantera/zeroD/ConstPressureReactor.h @@ -1,6 +1,7 @@ //! @file ConstPressureReactor.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_CONSTP_REACTOR_H #define CT_CONSTP_REACTOR_H diff --git a/include/cantera/zeroD/FlowDevice.h b/include/cantera/zeroD/FlowDevice.h index 28d1fb288..81d340470 100644 --- a/include/cantera/zeroD/FlowDevice.h +++ b/include/cantera/zeroD/FlowDevice.h @@ -1,6 +1,7 @@ //! @file FlowDevice.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FLOWDEVICE_H #define CT_FLOWDEVICE_H diff --git a/include/cantera/zeroD/FlowReactor.h b/include/cantera/zeroD/FlowReactor.h index 7d97910e6..71623a05b 100644 --- a/include/cantera/zeroD/FlowReactor.h +++ b/include/cantera/zeroD/FlowReactor.h @@ -1,6 +1,7 @@ //! @file FlowReactor.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FLOWREACTOR_H #define CT_FLOWREACTOR_H diff --git a/include/cantera/zeroD/IdealGasConstPressureReactor.h b/include/cantera/zeroD/IdealGasConstPressureReactor.h index bdca2b36c..c1034db36 100644 --- a/include/cantera/zeroD/IdealGasConstPressureReactor.h +++ b/include/cantera/zeroD/IdealGasConstPressureReactor.h @@ -1,6 +1,7 @@ //! @file ConstPressureReactor.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IDEALGASCONSTP_REACTOR_H #define CT_IDEALGASCONSTP_REACTOR_H diff --git a/include/cantera/zeroD/IdealGasReactor.h b/include/cantera/zeroD/IdealGasReactor.h index babd7518c..71979333a 100644 --- a/include/cantera/zeroD/IdealGasReactor.h +++ b/include/cantera/zeroD/IdealGasReactor.h @@ -1,6 +1,7 @@ //! @file IdealGasReactor.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_IDEALGASREACTOR_H #define CT_IDEALGASREACTOR_H diff --git a/include/cantera/zeroD/Reactor.h b/include/cantera/zeroD/Reactor.h index 1cc0c20ca..a56a7ed4d 100644 --- a/include/cantera/zeroD/Reactor.h +++ b/include/cantera/zeroD/Reactor.h @@ -1,6 +1,7 @@ //! @file Reactor.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_REACTOR_H #define CT_REACTOR_H diff --git a/include/cantera/zeroD/ReactorBase.h b/include/cantera/zeroD/ReactorBase.h index b80f199d2..854b7f1a9 100644 --- a/include/cantera/zeroD/ReactorBase.h +++ b/include/cantera/zeroD/ReactorBase.h @@ -1,6 +1,7 @@ //! @file ReactorBase.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_REACTORBASE_H #define CT_REACTORBASE_H diff --git a/include/cantera/zeroD/ReactorFactory.h b/include/cantera/zeroD/ReactorFactory.h index be252456e..df638f7d4 100644 --- a/include/cantera/zeroD/ReactorFactory.h +++ b/include/cantera/zeroD/ReactorFactory.h @@ -1,6 +1,7 @@ //! @file ReactorFactory.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef REACTOR_FACTORY_H #define REACTOR_FACTORY_H diff --git a/include/cantera/zeroD/ReactorNet.h b/include/cantera/zeroD/ReactorNet.h index 0c214d11a..c1c385ae6 100644 --- a/include/cantera/zeroD/ReactorNet.h +++ b/include/cantera/zeroD/ReactorNet.h @@ -1,6 +1,7 @@ //! @file ReactorNet.h -// Copyright 2004 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_REACTORNET_H #define CT_REACTORNET_H diff --git a/include/cantera/zeroD/Reservoir.h b/include/cantera/zeroD/Reservoir.h index 99f798638..4f3cac813 100644 --- a/include/cantera/zeroD/Reservoir.h +++ b/include/cantera/zeroD/Reservoir.h @@ -1,6 +1,7 @@ //! @file Reservoir.h -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_RESERVOIR_H #define CT_RESERVOIR_H diff --git a/include/cantera/zeroD/Wall.h b/include/cantera/zeroD/Wall.h index 16913ba00..35f0917e6 100644 --- a/include/cantera/zeroD/Wall.h +++ b/include/cantera/zeroD/Wall.h @@ -1,6 +1,7 @@ //! @file Wall.h Header file for class Wall. -// Copyright 2001-2004 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_WALL_H #define CT_WALL_H diff --git a/include/cantera/zeroD/flowControllers.h b/include/cantera/zeroD/flowControllers.h index f45082e2d..a5b6d2503 100644 --- a/include/cantera/zeroD/flowControllers.h +++ b/include/cantera/zeroD/flowControllers.h @@ -1,6 +1,7 @@ //! @file flowControllers.h Some flow devices derived from class FlowDevice. -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_FLOWCONTR_H #define CT_FLOWCONTR_H diff --git a/interfaces/cython/cantera/examples/onedim/diffusion_flame_batch.py b/interfaces/cython/cantera/examples/onedim/diffusion_flame_batch.py index 717dc1dd7..ed84644d7 100644 --- a/interfaces/cython/cantera/examples/onedim/diffusion_flame_batch.py +++ b/interfaces/cython/cantera/examples/onedim/diffusion_flame_batch.py @@ -1,11 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (c) 2014 Thomas Fiala (fiala@td.mw.tum.de), Lehrstuhl für -# Thermodynamik, TU München. For conditions of distribution and use, see -# copyright notice in License.txt. -# -############################################################################### + +# This file is part of Cantera. See License.txt in the top-level directory or +# at http://www.cantera.org/license.txt for license and copyright information. + """ This example creates two batches of counterflow diffusion flame simulations. The first batch computes counterflow flames at increasing pressure, the second diff --git a/interfaces/cython/cantera/examples/onedim/diffusion_flame_extinction.py b/interfaces/cython/cantera/examples/onedim/diffusion_flame_extinction.py index 6f462e7ce..862633b03 100644 --- a/interfaces/cython/cantera/examples/onedim/diffusion_flame_extinction.py +++ b/interfaces/cython/cantera/examples/onedim/diffusion_flame_extinction.py @@ -1,11 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Copyright (c) 2014 Thomas Fiala (fiala@td.mw.tum.de), Lehrstuhl für -# Thermodynamik, TU München. For conditions of distribution and use, see -# copyright notice in License.txt. -# -############################################################################### + +# This file is part of Cantera. See License.txt in the top-level directory or +# at http://www.cantera.org/license.txt for license and copyright information. + """ This example computes the extinction point of a counterflow diffusion flame. A hydrogen-oxygen diffusion flame at 1 bar is studied. diff --git a/samples/cxx/kinetics1/kinetics1.cpp b/samples/cxx/kinetics1/kinetics1.cpp index 0c787d734..51d6fff9d 100644 --- a/samples/cxx/kinetics1/kinetics1.cpp +++ b/samples/cxx/kinetics1/kinetics1.cpp @@ -2,10 +2,11 @@ // // zero-dimensional kinetics example program // -// copyright California Institute of Technology 2002 -// ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/zerodim.h" #include "cantera/IdealGasMix.h" #include "example_utils.h" diff --git a/src/base/checkFinite.cpp b/src/base/checkFinite.cpp index e017b6ada..7fd84df7c 100644 --- a/src/base/checkFinite.cpp +++ b/src/base/checkFinite.cpp @@ -2,12 +2,9 @@ * @file checkFinite.cpp Declarations for routines that check for the * presence of NaNs in the code. */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ct_defs.h" #include "cantera/base/stringUtils.h" diff --git a/src/base/clockWC.cpp b/src/base/clockWC.cpp index 2d1cd774b..64dc151b3 100644 --- a/src/base/clockWC.cpp +++ b/src/base/clockWC.cpp @@ -3,12 +3,9 @@ * Definitions for a simple class that implements an Ansi C wall clock timer * (see \ref Cantera::clockWC). */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include #include "cantera/base/clockWC.h" diff --git a/src/base/ct2ctml.cpp b/src/base/ct2ctml.cpp index 70e34c3e2..c1215f08a 100644 --- a/src/base/ct2ctml.cpp +++ b/src/base/ct2ctml.cpp @@ -3,7 +3,9 @@ * Driver for the system call to the python executable that converts * cti files to ctml files (see \ref inputfiles). */ -// Copyright 2001-2005 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ctml.h" #include "cantera/base/stringUtils.h" diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp index 63af5f096..0c5d33b2a 100644 --- a/src/base/ctml.cpp +++ b/src/base/ctml.cpp @@ -2,7 +2,9 @@ * @file ctml.cpp * Definitions for functions to read and write CTML. */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ctml.h" #include "cantera/base/stringUtils.h" diff --git a/src/base/plots.cpp b/src/base/plots.cpp index 9cce0703b..a23b79e5e 100644 --- a/src/base/plots.cpp +++ b/src/base/plots.cpp @@ -1,7 +1,9 @@ /** * @file plots.cpp */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/plots.h" diff --git a/src/base/stringUtils.cpp b/src/base/stringUtils.cpp index 771d1a428..82dff3e66 100644 --- a/src/base/stringUtils.cpp +++ b/src/base/stringUtils.cpp @@ -3,7 +3,9 @@ * Contains definitions for string manipulation functions * within Cantera. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. //@{ #include "cantera/base/ct_defs.h" diff --git a/src/base/units.h b/src/base/units.h index 636cf7f99..85f40b3f9 100644 --- a/src/base/units.h +++ b/src/base/units.h @@ -6,7 +6,9 @@ * * This header is included only by file misc.cpp. */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_UNITS_H #define CT_UNITS_H diff --git a/src/base/xml.cpp b/src/base/xml.cpp index 927addb6e..727a87fe8 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -4,7 +4,9 @@ * implement only those aspects of XML required to read, write, and * manipulate CTML data files. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/xml.h" #include "cantera/base/stringUtils.h" diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index da10b7142..1e4062af2 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -4,7 +4,8 @@ * ChemEquil. */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/ChemEquil.h" #include "cantera/base/stringUtils.h" diff --git a/src/equil/vcs_Gibbs.cpp b/src/equil/vcs_Gibbs.cpp index 7c48ebe58..a3e7359c0 100644 --- a/src/equil/vcs_Gibbs.cpp +++ b/src/equil/vcs_Gibbs.cpp @@ -2,11 +2,9 @@ * @file vcs_Gibbs.cpp * Functions which calculate the extrinsic Gibbs Free energies */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp index b88544ad9..ae1493525 100644 --- a/src/equil/vcs_MultiPhaseEquil.cpp +++ b/src/equil/vcs_MultiPhaseEquil.cpp @@ -2,11 +2,9 @@ * @file vcs_MultiPhaseEquil.cpp * Driver routine for the VCSnonideal equilibrium solver package */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_MultiPhaseEquil.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp index 252d5d08c..19e0b722f 100644 --- a/src/equil/vcs_VolPhase.cpp +++ b/src/equil/vcs_VolPhase.cpp @@ -1,11 +1,10 @@ /** * @file vcs_VolPhase.cpp */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/equil/vcs_VolPhase.h" #include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_solve.h" diff --git a/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp index 9edcab763..1c9b98259 100644 --- a/src/equil/vcs_elem_rearrange.cpp +++ b/src/equil/vcs_elem_rearrange.cpp @@ -3,11 +3,9 @@ * Contains implementations for rearranging the element columns, and * it contains the algorithm for choosing the rearrangement. */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp index f70e959f9..12ef27085 100644 --- a/src/equil/vcs_inest.cpp +++ b/src/equil/vcs_inest.cpp @@ -2,11 +2,9 @@ * @file vcs_inest.cpp * Implementation methods for obtaining a good initial guess */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp index 4c4d750d9..d98817109 100644 --- a/src/equil/vcs_nondim.cpp +++ b/src/equil/vcs_nondim.cpp @@ -2,11 +2,9 @@ * @file vcs_nondim.cpp * Nondimensionalization routines within VCSnonideal */ -/* - * Copyright (2007) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_prep.cpp b/src/equil/vcs_prep.cpp index d8018c3b0..1df67050b 100644 --- a/src/equil/vcs_prep.cpp +++ b/src/equil/vcs_prep.cpp @@ -3,11 +3,8 @@ * This file contains some prepatory functions. */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_prob.h" diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp index 8bbb03711..2364d6d1d 100644 --- a/src/equil/vcs_prob.cpp +++ b/src/equil/vcs_prob.cpp @@ -3,11 +3,9 @@ * Implementation for the Interface class for the vcs thermo * equilibrium solver package, */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_prob.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_rearrange.cpp b/src/equil/vcs_rearrange.cpp index d55e98440..5a7b700e4 100644 --- a/src/equil/vcs_rearrange.cpp +++ b/src/equil/vcs_rearrange.cpp @@ -2,11 +2,9 @@ * @file vcs_rearrange.cpp * implementation file for rearranging species. */ -/* - * Copyright (2007) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" diff --git a/src/equil/vcs_report.cpp b/src/equil/vcs_report.cpp index d8d8e7124..95a38a0e8 100644 --- a/src/equil/vcs_report.cpp +++ b/src/equil/vcs_report.cpp @@ -1,9 +1,7 @@ //! @file vcs_report.cpp -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_rxnadj.cpp b/src/equil/vcs_rxnadj.cpp index 5b5f23d36..e3899395a 100644 --- a/src/equil/vcs_rxnadj.cpp +++ b/src/equil/vcs_rxnadj.cpp @@ -2,11 +2,9 @@ * @file vcs_rxnadj.cpp * Routines for carrying out various adjustments to the reaction steps */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_setMolesLinProg.cpp b/src/equil/vcs_setMolesLinProg.cpp index b6d8278b0..eac8c4603 100644 --- a/src/equil/vcs_setMolesLinProg.cpp +++ b/src/equil/vcs_setMolesLinProg.cpp @@ -1,11 +1,9 @@ /*! * @file vcs_setMolesLinProg.cpp */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp index 6622ff4c4..99a0758a7 100644 --- a/src/equil/vcs_solve.cpp +++ b/src/equil/vcs_solve.cpp @@ -2,11 +2,9 @@ * @file vcs_solve.cpp Implementation file for the internal class that holds * the problem. */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/base/ctexceptions.h" diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp index 93a3a8533..c3d853df9 100644 --- a/src/equil/vcs_solve_TP.cpp +++ b/src/equil/vcs_solve_TP.cpp @@ -2,11 +2,9 @@ * @file vcs_solve_TP.cpp Implementation file that contains the * main algorithm for finding an equilibrium */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_VolPhase.h" diff --git a/src/equil/vcs_solve_phaseStability.cpp b/src/equil/vcs_solve_phaseStability.cpp index a886934a6..7cefb4009 100644 --- a/src/equil/vcs_solve_phaseStability.cpp +++ b/src/equil/vcs_solve_phaseStability.cpp @@ -1,10 +1,7 @@ //! @file vcs_solve_phaseStability.cpp -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_solve.h" #include "cantera/equil/vcs_prob.h" diff --git a/src/equil/vcs_species_thermo.cpp b/src/equil/vcs_species_thermo.cpp index 2ade332c4..85f75a18c 100644 --- a/src/equil/vcs_species_thermo.cpp +++ b/src/equil/vcs_species_thermo.cpp @@ -2,11 +2,9 @@ * @file vcs_species_thermo.cpp Implementation for the VCS_SPECIES_THERMO * object. */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_species_thermo.h" #include "cantera/equil/vcs_defs.h" diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp index dec0db717..66c60eb9b 100644 --- a/src/equil/vcs_util.cpp +++ b/src/equil/vcs_util.cpp @@ -2,11 +2,9 @@ * @file vcs_util.cpp * Internal definitions for utility functions for the VCSnonideal package */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_internal.h" #include "cantera/equil/vcs_defs.h" diff --git a/src/fortran/fctxml.cpp b/src/fortran/fctxml.cpp index a25c47032..b40fb4b8a 100644 --- a/src/fortran/fctxml.cpp +++ b/src/fortran/fctxml.cpp @@ -2,8 +2,9 @@ * @file fctxml.cpp * */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "clib/clib_utils.h" #include "cantera/base/ctml.h" diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp index e46d38bd8..6dfc75a13 100644 --- a/src/kinetics/AqueousKinetics.cpp +++ b/src/kinetics/AqueousKinetics.cpp @@ -3,11 +3,9 @@ * * Homogeneous kinetics in an aqueous phase, either condensed or dilute in salts */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/AqueousKinetics.h" #include "cantera/kinetics/Reaction.h" diff --git a/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp index 83be16e66..83ffffa78 100644 --- a/src/kinetics/FalloffFactory.cpp +++ b/src/kinetics/FalloffFactory.cpp @@ -1,7 +1,9 @@ /** * @file FalloffFactory.cpp */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/FalloffFactory.h" #include "cantera/kinetics/reaction_defs.h" diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp index 96b7d8a19..fb3c767f2 100644 --- a/src/kinetics/GasKinetics.cpp +++ b/src/kinetics/GasKinetics.cpp @@ -2,7 +2,8 @@ * @file GasKinetics.cpp Homogeneous kinetics in ideal gases */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/GasKinetics.h" diff --git a/src/kinetics/Group.cpp b/src/kinetics/Group.cpp index b66c81d61..927ab8cb9 100644 --- a/src/kinetics/Group.cpp +++ b/src/kinetics/Group.cpp @@ -3,7 +3,8 @@ * analysis. */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/Group.h" #include diff --git a/src/kinetics/ImplicitSurfChem.cpp b/src/kinetics/ImplicitSurfChem.cpp index 67b6c8dfa..49d926640 100644 --- a/src/kinetics/ImplicitSurfChem.cpp +++ b/src/kinetics/ImplicitSurfChem.cpp @@ -4,7 +4,9 @@ * (see \ref kineticsmgr and class * \link Cantera::ImplicitSurfChem ImplicitSurfChem\endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/ImplicitSurfChem.h" #include "cantera/kinetics/solveSP.h" diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp index bc3ee94c4..8418feb17 100644 --- a/src/kinetics/InterfaceKinetics.cpp +++ b/src/kinetics/InterfaceKinetics.cpp @@ -2,7 +2,8 @@ * @file InterfaceKinetics.cpp */ -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/InterfaceKinetics.h" #include "cantera/kinetics/RateCoeffMgr.h" diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp index 6b41971be..2b5a5d6c7 100644 --- a/src/kinetics/Kinetics.cpp +++ b/src/kinetics/Kinetics.cpp @@ -5,7 +5,9 @@ * Kinetics managers calculate rates of progress of species due to * homogeneous or heterogeneous kinetics. */ -// Copyright 2001-2004 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/Kinetics.h" #include "cantera/kinetics/Reaction.h" diff --git a/src/kinetics/KineticsFactory.cpp b/src/kinetics/KineticsFactory.cpp index 7b9921388..2ac522171 100644 --- a/src/kinetics/KineticsFactory.cpp +++ b/src/kinetics/KineticsFactory.cpp @@ -1,7 +1,9 @@ /** * @file KineticsFactory.cpp */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/KineticsFactory.h" #include "cantera/kinetics/GasKinetics.h" diff --git a/src/kinetics/ReactionPath.cpp b/src/kinetics/ReactionPath.cpp index eee0c3077..7f75aa2cd 100644 --- a/src/kinetics/ReactionPath.cpp +++ b/src/kinetics/ReactionPath.cpp @@ -2,7 +2,9 @@ * @file ReactionPath.cpp * Implementation file for classes used in reaction path analysis. */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/ReactionPath.h" #include "cantera/kinetics/reaction_defs.h" diff --git a/src/kinetics/importKinetics.cpp b/src/kinetics/importKinetics.cpp index 18acd4b47..9aeb4f837 100644 --- a/src/kinetics/importKinetics.cpp +++ b/src/kinetics/importKinetics.cpp @@ -9,7 +9,9 @@ * of these routines is to initialize the %Cantera objects with data * from the ctml tree structures. */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/importKinetics.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp index 19ccba7f0..3efc866a0 100644 --- a/src/kinetics/solveSP.cpp +++ b/src/kinetics/solveSP.cpp @@ -1,12 +1,9 @@ /* * @file: solveSP.cpp Implicit surface site concentration solver */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/kinetics/solveSP.h" #include "cantera/thermo/SurfPhase.h" diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp index b449d3db4..0bcccde96 100644 --- a/src/numerics/BandMatrix.cpp +++ b/src/numerics/BandMatrix.cpp @@ -1,6 +1,7 @@ //! @file BandMatrix.cpp Banded matrices. -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/numerics/BandMatrix.h" #include "cantera/base/utilities.h" diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp index 8bace1f80..5b29da06a 100644 --- a/src/numerics/CVodesIntegrator.cpp +++ b/src/numerics/CVodesIntegrator.cpp @@ -1,6 +1,8 @@ //! @file CVodesIntegrator.cpp -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/numerics/CVodesIntegrator.h" #include "cantera/base/stringUtils.h" diff --git a/src/numerics/DAE_solvers.cpp b/src/numerics/DAE_solvers.cpp index 2771fcba8..e95ab045d 100644 --- a/src/numerics/DAE_solvers.cpp +++ b/src/numerics/DAE_solvers.cpp @@ -1,11 +1,7 @@ //! @file DAE_solvers.cpp Factory routine for picking the DAE solver package -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ct_defs.h" #include "cantera/numerics/DAE_Solver.h" diff --git a/src/numerics/DenseMatrix.cpp b/src/numerics/DenseMatrix.cpp index a6b1e7154..a01dfa0b6 100644 --- a/src/numerics/DenseMatrix.cpp +++ b/src/numerics/DenseMatrix.cpp @@ -2,7 +2,8 @@ * @file DenseMatrix.cpp */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/numerics/DenseMatrix.h" #include "cantera/base/stringUtils.h" diff --git a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp index 25c546c46..b08ceb86b 100644 --- a/src/numerics/IDA_Solver.cpp +++ b/src/numerics/IDA_Solver.cpp @@ -1,6 +1,7 @@ //! @file IDA_Solver.cpp -// Copyright 2006 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/numerics/IDA_Solver.h" #include "cantera/base/stringUtils.h" diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp index ea291ce5b..37e54f91c 100644 --- a/src/numerics/ResidJacEval.cpp +++ b/src/numerics/ResidJacEval.cpp @@ -1,11 +1,7 @@ //! @file ResidJacEval.cpp -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ct_defs.h" #include "cantera/numerics/ResidJacEval.h" diff --git a/src/numerics/RootFind.cpp b/src/numerics/RootFind.cpp index e8b8aaa9b..db206b1b5 100644 --- a/src/numerics/RootFind.cpp +++ b/src/numerics/RootFind.cpp @@ -1,11 +1,7 @@ //! @file: RootFind.cpp root finder for 1D problems -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/numerics/RootFind.h" #include "cantera/base/utilities.h" diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp index 8e3d5324d..b4064623c 100644 --- a/src/numerics/SquareMatrix.cpp +++ b/src/numerics/SquareMatrix.cpp @@ -1,11 +1,7 @@ //! @file SquareMatrix.cpp -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/stringUtils.h" #include "cantera/numerics/SquareMatrix.h" diff --git a/src/numerics/funcs.cpp b/src/numerics/funcs.cpp index 6a9cb2a7e..bbf7699f0 100644 --- a/src/numerics/funcs.cpp +++ b/src/numerics/funcs.cpp @@ -1,9 +1,7 @@ //! @file funcs.cpp file containing miscellaneous numerical functions. -/* - * Copyright 2001-2003 California Institute of Technology - * See file License.txt for licensing information - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/numerics/funcs.h" diff --git a/src/oneD/MultiJac.cpp b/src/oneD/MultiJac.cpp index 5faa2bd57..81ba04c7c 100644 --- a/src/oneD/MultiJac.cpp +++ b/src/oneD/MultiJac.cpp @@ -1,8 +1,7 @@ //! @file MultiJac.cpp Implementation file for class MultiJac -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/oneD/MultiJac.h" #include diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp index 3f3e75a49..fbb07c0ab 100644 --- a/src/oneD/MultiNewton.cpp +++ b/src/oneD/MultiNewton.cpp @@ -1,8 +1,7 @@ //! @file MultiNewton.cpp Damped Newton solver for 1D multi-domain problems -/* - * Copyright 2001 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/oneD/MultiNewton.h" #include "cantera/base/utilities.h" diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index e3625f46a..b32fa4b8b 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -1,6 +1,7 @@ //! @file StFlow.cpp -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/oneD/StFlow.h" #include "cantera/base/ctml.h" diff --git a/src/oneD/boundaries1D.cpp b/src/oneD/boundaries1D.cpp index d62d8d5a4..0bda2cdf0 100644 --- a/src/oneD/boundaries1D.cpp +++ b/src/oneD/boundaries1D.cpp @@ -1,6 +1,7 @@ //! @file boundaries1D.cpp -// Copyright 2002-3 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/oneD/Inlet1D.h" #include "cantera/oneD/OneDim.h" diff --git a/src/thermo/ConstCpPoly.cpp b/src/thermo/ConstCpPoly.cpp index 2bc621064..99c836b7a 100644 --- a/src/thermo/ConstCpPoly.cpp +++ b/src/thermo/ConstCpPoly.cpp @@ -4,7 +4,9 @@ * employs a constant heat capacity assumption (see \ref spthermo and * \link Cantera::ConstCpPoly ConstCpPoly \endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/ConstCpPoly.h" diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp index 6110088e4..4fe455136 100644 --- a/src/thermo/ConstDensityThermo.cpp +++ b/src/thermo/ConstDensityThermo.cpp @@ -5,7 +5,9 @@ \endlink). */ -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/ConstDensityThermo.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp index ab573a6ee..92325f609 100644 --- a/src/thermo/DebyeHuckel.cpp +++ b/src/thermo/DebyeHuckel.cpp @@ -7,11 +7,9 @@ * Class DebyeHuckel represents a dilute liquid electrolyte phase which * obeys the Debye Huckel formulation for nonideality. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/DebyeHuckel.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/Elements.cpp b/src/thermo/Elements.cpp index 109e88494..f9eec3bfa 100644 --- a/src/thermo/Elements.cpp +++ b/src/thermo/Elements.cpp @@ -3,7 +3,8 @@ * This file contains a database of atomic weights. */ -// Copyright 2003 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/Elements.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp index 016dc6ad1..80fc97c9c 100644 --- a/src/thermo/FixedChemPotSSTP.cpp +++ b/src/thermo/FixedChemPotSSTP.cpp @@ -5,11 +5,8 @@ * class \link Cantera::FixedChemPotSSTP FixedChemPotSSTP\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/FixedChemPotSSTP.h" diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp index bee316091..9f16eea6a 100644 --- a/src/thermo/GibbsExcessVPSSTP.cpp +++ b/src/thermo/GibbsExcessVPSSTP.cpp @@ -9,11 +9,10 @@ * further based upon expressions for the excess Gibbs free energy expressed as * a function of the mole fractions. */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/GibbsExcessVPSSTP.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp index 4d6bbb237..02939a884 100644 --- a/src/thermo/HMWSoln.cpp +++ b/src/thermo/HMWSoln.cpp @@ -11,11 +11,9 @@ * parameter consistent with the temperature expansions used for Beta0, * Beta1, and Cphi.(CFJC, SNL) */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/HMWSoln.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp index b3aaec772..d3e704ae8 100644 --- a/src/thermo/HMWSoln_input.cpp +++ b/src/thermo/HMWSoln_input.cpp @@ -7,11 +7,10 @@ * This file contains definitions for reading in the interaction terms * in the formulation. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/HMWSoln.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/thermo/PDSS_Water.h" diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp index a488e122c..45f45d6a5 100644 --- a/src/thermo/IdealMolalSoln.cpp +++ b/src/thermo/IdealMolalSoln.cpp @@ -11,11 +11,10 @@ * one. This turns out, actually, to be highly nonlinear when the solvent * densities get low. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/IdealMolalSoln.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp index c790a7b6d..98224b7f5 100644 --- a/src/thermo/IdealSolidSolnPhase.cpp +++ b/src/thermo/IdealSolidSolnPhase.cpp @@ -4,11 +4,9 @@ * thermoprops and \link Cantera::IdealSolidSolnPhase * IdealSolidSolnPhase\endlink). */ -/* - * Copyright 2006 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000, with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/IdealSolidSolnPhase.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/IdealSolnGasVPSS.cpp b/src/thermo/IdealSolnGasVPSS.cpp index 4749ddaa0..ceb697485 100644 --- a/src/thermo/IdealSolnGasVPSS.cpp +++ b/src/thermo/IdealSolnGasVPSS.cpp @@ -6,11 +6,9 @@ * thermodynamic properties (see \ref thermoprops and * class \link Cantera::IdealSolnGasVPSS IdealSolnGasVPSS\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/IdealSolnGasVPSS.h" #include "cantera/thermo/PDSS.h" diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp index 0d2979eea..a593f8fb3 100644 --- a/src/thermo/IonsFromNeutralVPSSTP.cpp +++ b/src/thermo/IonsFromNeutralVPSSTP.cpp @@ -10,11 +10,10 @@ * further based upon expressions for the excess Gibbs free energy expressed as * a function of the mole fractions. */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/IonsFromNeutralVPSSTP.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/thermo/PDSS_IonsFromNeutral.h" diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp index 9ddf839de..7a65cf9c1 100644 --- a/src/thermo/MargulesVPSSTP.cpp +++ b/src/thermo/MargulesVPSSTP.cpp @@ -5,11 +5,10 @@ * expansions (see \ref thermoprops * and class \link Cantera::MargulesVPSSTP MargulesVPSSTP\endlink). */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/MargulesVPSSTP.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/MaskellSolidSolnPhase.cpp b/src/thermo/MaskellSolidSolnPhase.cpp index ff3adc5ed..a287db965 100644 --- a/src/thermo/MaskellSolidSolnPhase.cpp +++ b/src/thermo/MaskellSolidSolnPhase.cpp @@ -4,11 +4,9 @@ * thermoprops and \link Cantera::MaskellSolidSolnPhase * MaskellSolidSolnPhase\endlink). */ -/* - * Copyright 2006 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000, with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/MaskellSolidSolnPhase.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp index 79f1ef27a..455503c8d 100644 --- a/src/thermo/MetalSHEelectrons.cpp +++ b/src/thermo/MetalSHEelectrons.cpp @@ -6,12 +6,9 @@ * class \link Cantera::MetalSHEelectrons MetalSHEelectrons\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - * - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/mix_defs.h" #include "cantera/base/ctml.h" #include "cantera/thermo/MetalSHEelectrons.h" diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp index 9fbe9edf5..44b171035 100644 --- a/src/thermo/MineralEQ3.cpp +++ b/src/thermo/MineralEQ3.cpp @@ -5,13 +5,9 @@ * class \link Cantera::MineralEQ3 MineralEQ3\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - * - * Copyright 2001 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/base/ctml.h" #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/MineralEQ3.h" diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp index 5ea7f8867..b99355579 100644 --- a/src/thermo/MixedSolventElectrolyte.cpp +++ b/src/thermo/MixedSolventElectrolyte.cpp @@ -2,11 +2,9 @@ * @file MixedSolventElectrolyte.cpp see \ref thermoprops and class \link * Cantera::MixedSolventElectrolyte MixedSolventElectrolyte \endlink). */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/MixedSolventElectrolyte.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/MixtureFugacityTP.cpp b/src/thermo/MixtureFugacityTP.cpp index 1c56a9428..91b70ce93 100644 --- a/src/thermo/MixtureFugacityTP.cpp +++ b/src/thermo/MixtureFugacityTP.cpp @@ -4,11 +4,9 @@ * non-ideal mixtures based on the fugacity models (see \ref thermoprops and * class \link Cantera::MixtureFugacityTP MixtureFugacityTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/MixtureFugacityTP.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp index 663c9c466..6576cd2a1 100644 --- a/src/thermo/MolalityVPSSTP.cpp +++ b/src/thermo/MolalityVPSSTP.cpp @@ -5,11 +5,10 @@ * (see \ref thermoprops * and class \link Cantera::MolalityVPSSTP MolalityVPSSTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/MolalityVPSSTP.h" #include "cantera/base/stringUtils.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp index eb8a9619e..7182d22d9 100644 --- a/src/thermo/MolarityIonicVPSSTP.cpp +++ b/src/thermo/MolarityIonicVPSSTP.cpp @@ -10,11 +10,10 @@ * further based upon expressions for the excess Gibbs free energy expressed as * a function of the mole fractions. */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/MolarityIonicVPSSTP.h" #include "cantera/thermo/ThermoFactory.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/MultiSpeciesThermo.cpp b/src/thermo/MultiSpeciesThermo.cpp index 8d2a66b05..4c2fc4cc0 100644 --- a/src/thermo/MultiSpeciesThermo.cpp +++ b/src/thermo/MultiSpeciesThermo.cpp @@ -4,7 +4,9 @@ * in a phase (see \ref spthermo and * \link Cantera::MultiSpeciesThermo MultiSpeciesThermo\endlink). */ -// Copyright 2001-2004 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/MultiSpeciesThermo.h" #include "cantera/thermo/SpeciesThermoFactory.h" diff --git a/src/thermo/Nasa9Poly1.cpp b/src/thermo/Nasa9Poly1.cpp index abf685a8a..1b6c8ad05 100644 --- a/src/thermo/Nasa9Poly1.cpp +++ b/src/thermo/Nasa9Poly1.cpp @@ -8,7 +8,9 @@ * * This parameterization has one NASA temperature region. */ -// Copyright 2007 Sandia National Laboratories + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/Nasa9Poly1.h" diff --git a/src/thermo/Nasa9PolyMultiTempRegion.cpp b/src/thermo/Nasa9PolyMultiTempRegion.cpp index c40f6885b..dc4003616 100644 --- a/src/thermo/Nasa9PolyMultiTempRegion.cpp +++ b/src/thermo/Nasa9PolyMultiTempRegion.cpp @@ -10,7 +10,9 @@ * * This parameterization has one NASA temperature region. */ -// Copyright 2007 Sandia National Laboratories + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ctexceptions.h" #include "cantera/thermo/Nasa9PolyMultiTempRegion.h" diff --git a/src/thermo/PDSS.cpp b/src/thermo/PDSS.cpp index 0d65f74fd..e8b5a38f4 100644 --- a/src/thermo/PDSS.cpp +++ b/src/thermo/PDSS.cpp @@ -4,11 +4,10 @@ * virtual function * (see class \link Cantera::PDSS PDSS\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index b49d518ac..5dffbe928 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -3,11 +3,10 @@ * Implementation of a pressure dependent standard state * virtual function. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_ConstVol.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp index 622afee25..8b6cc4748 100644 --- a/src/thermo/PDSS_HKFT.cpp +++ b/src/thermo/PDSS_HKFT.cpp @@ -5,11 +5,9 @@ * HKFT standard state * (see \ref pdssthermo and class \link Cantera::PDSS_HKFT PDSS_HKFT\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_HKFT.h" diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index ee45acc0c..ccef0749a 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -3,11 +3,10 @@ * Implementation of a pressure dependent standard state * virtual function. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_IdealGas.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 6a6ca871f..7e95ca0ff 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -3,11 +3,9 @@ * Implementation of a pressure dependent standard state * virtual function. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/PDSS_IonsFromNeutral.h" #include "cantera/thermo/IonsFromNeutralVPSSTP.h" diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index 4d4f35bc4..b0ed0eb84 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -3,11 +3,10 @@ * Implementation of a pressure dependent standard state * virtual function. */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_SSVol.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp index fcc200eec..34655aae8 100644 --- a/src/thermo/PDSS_Water.cpp +++ b/src/thermo/PDSS_Water.cpp @@ -1,11 +1,10 @@ /** * @file PDSS_Water.cpp */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/base/ctml.h" #include "cantera/thermo/PDSS_Water.h" #include "cantera/thermo/WaterPropsIAPWS.h" diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp index f5919a568..8faf377c9 100644 --- a/src/thermo/Phase.cpp +++ b/src/thermo/Phase.cpp @@ -3,7 +3,8 @@ * Definition file for class Phase. */ -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/Phase.h" #include "cantera/base/utilities.h" diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp index 0e762880c..430f7ff83 100644 --- a/src/thermo/PhaseCombo_Interaction.cpp +++ b/src/thermo/PhaseCombo_Interaction.cpp @@ -1,11 +1,9 @@ /** * @file PhaseCombo_Interaction.cpp */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/PhaseCombo_Interaction.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp index fcf22ad6b..2b3fe6b58 100644 --- a/src/thermo/RedlichKisterVPSSTP.cpp +++ b/src/thermo/RedlichKisterVPSSTP.cpp @@ -5,11 +5,9 @@ * expansions (see \ref thermoprops * and class \link Cantera::RedlichKisterVPSSTP RedlichKisterVPSSTP\endlink). */ -/* - * Copyright (2009) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/RedlichKisterVPSSTP.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index ea7a0ed50..5a491d704 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -1,10 +1,7 @@ //! @file RedlichKwongMFTP.cpp -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/RedlichKwongMFTP.h" #include "cantera/thermo/mix_defs.h" diff --git a/src/thermo/SingleSpeciesTP.cpp b/src/thermo/SingleSpeciesTP.cpp index 79b270548..bcc9e3570 100644 --- a/src/thermo/SingleSpeciesTP.cpp +++ b/src/thermo/SingleSpeciesTP.cpp @@ -5,11 +5,9 @@ * ( see \ref thermoprops and class \link Cantera::SingleSpeciesTP SingleSpeciesTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/SingleSpeciesTP.h" #include "cantera/base/stringUtils.h" #include "cantera/base/global.h" diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp index c2db4023a..1973b16d2 100644 --- a/src/thermo/SpeciesThermoFactory.cpp +++ b/src/thermo/SpeciesThermoFactory.cpp @@ -4,7 +4,9 @@ * manage the standard-state thermodynamic properties of a set of species * (see \ref spthermo); */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/SpeciesThermoFactory.h" #include "cantera/thermo/MultiSpeciesThermo.h" diff --git a/src/thermo/SpeciesThermoInterpType.cpp b/src/thermo/SpeciesThermoInterpType.cpp index ee5d2df7a..f89cfa2d5 100644 --- a/src/thermo/SpeciesThermoInterpType.cpp +++ b/src/thermo/SpeciesThermoInterpType.cpp @@ -1,7 +1,9 @@ /** * @file SpeciesThermoInterpType.cpp */ -// Copyright 2007 Sandia National Laboratories + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/SpeciesThermoInterpType.h" #include "cantera/thermo/VPSSMgr.h" diff --git a/src/thermo/StoichSubstance.cpp b/src/thermo/StoichSubstance.cpp index 6266591c6..e77a07976 100644 --- a/src/thermo/StoichSubstance.cpp +++ b/src/thermo/StoichSubstance.cpp @@ -5,13 +5,9 @@ * class \link Cantera::StoichSubstance StoichSubstance\endlink) */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - * - * Copyright 2001 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/StoichSubstance.h" #include "cantera/thermo/mix_defs.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/SurfPhase.cpp b/src/thermo/SurfPhase.cpp index bcdfab9e2..ea569f7ce 100644 --- a/src/thermo/SurfPhase.cpp +++ b/src/thermo/SurfPhase.cpp @@ -5,7 +5,9 @@ * (see \ref thermoprops and class * \link Cantera::SurfPhase SurfPhase\endlink). */ -// Copyright 2002 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/SurfPhase.h" #include "cantera/thermo/EdgePhase.h" diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp index 0f3e43c7c..b6068caf3 100644 --- a/src/thermo/ThermoFactory.cpp +++ b/src/thermo/ThermoFactory.cpp @@ -3,7 +3,9 @@ * Definitions for the factory class that can create known ThermoPhase objects * (see \ref thermoprops and class \link Cantera::ThermoFactory ThermoFactory\endlink). */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/ThermoFactory.h" diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index 846724532..8eb070efe 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -5,7 +5,8 @@ * (see class \link Cantera::ThermoPhase ThermoPhase\endlink). */ -// Copyright 2002 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/ThermoPhase.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/VPSSMgr.cpp b/src/thermo/VPSSMgr.cpp index 4f95137e3..4b7107086 100644 --- a/src/thermo/VPSSMgr.cpp +++ b/src/thermo/VPSSMgr.cpp @@ -6,11 +6,9 @@ * (see \ref mgrpdssthermocalc and * class \link Cantera::VPSSMgr VPSSMgr\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPSSMgr.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/VPSSMgrFactory.cpp b/src/thermo/VPSSMgrFactory.cpp index fdc459f03..d661e3e57 100644 --- a/src/thermo/VPSSMgrFactory.cpp +++ b/src/thermo/VPSSMgrFactory.cpp @@ -5,11 +5,9 @@ * (see \ref spthermo and class * \link Cantera::VPSSMgrFactory VPSSMgrFactory\endlink); */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "VPSSMgrFactory.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h index ab32ad71a..566734212 100644 --- a/src/thermo/VPSSMgrFactory.h +++ b/src/thermo/VPSSMgrFactory.h @@ -4,11 +4,9 @@ * standard-state thermodynamic properties of a set of species * (see \ref mgrpdssthermocalc and class \link Cantera::VPSSMgrFactory VPSSMgrFactory\endlink); */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef VPSSSPECIESTHERMO_FACTORY_H #define VPSSSPECIESTHERMO_FACTORY_H diff --git a/src/thermo/VPSSMgr_ConstVol.cpp b/src/thermo/VPSSMgr_ConstVol.cpp index a6f00cbd1..07768b2f8 100644 --- a/src/thermo/VPSSMgr_ConstVol.cpp +++ b/src/thermo/VPSSMgr_ConstVol.cpp @@ -6,11 +6,9 @@ * dependence (see \ref thermoprops and * class \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPSSMgr_ConstVol.h" #include "cantera/thermo/VPStandardStateTP.h" diff --git a/src/thermo/VPSSMgr_General.cpp b/src/thermo/VPSSMgr_General.cpp index 4837f075e..86534c217 100644 --- a/src/thermo/VPSSMgr_General.cpp +++ b/src/thermo/VPSSMgr_General.cpp @@ -6,11 +6,9 @@ * but slow way (see \ref thermoprops and * class \link Cantera::VPSSMgr_General VPSSMgr_General\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPSSMgr_General.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/VPSSMgr_IdealGas.cpp b/src/thermo/VPSSMgr_IdealGas.cpp index 8b4449c9b..f98183d5e 100644 --- a/src/thermo/VPSSMgr_IdealGas.cpp +++ b/src/thermo/VPSSMgr_IdealGas.cpp @@ -6,11 +6,9 @@ * (see \ref thermoprops and * class \link Cantera::VPSSMgr_IdealGas VPSSMgr_IdealGas\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPSSMgr_IdealGas.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/VPSSMgr_Water_ConstVol.cpp b/src/thermo/VPSSMgr_Water_ConstVol.cpp index 4fd5efef0..3fab37d3c 100644 --- a/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -8,11 +8,8 @@ * \link Cantera::VPSSMgr_Water_ConstVol VPSSMgr_Water_ConstVol\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPSSMgr_Water_ConstVol.h" #include "cantera/thermo/PDSS_Water.h" diff --git a/src/thermo/VPSSMgr_Water_HKFT.cpp b/src/thermo/VPSSMgr_Water_HKFT.cpp index 1b51577de..5a4019999 100644 --- a/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -8,11 +8,8 @@ * \link Cantera::VPSSMgr_Water_HKFT VPSSMgr_Water_HKFT\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPSSMgr_Water_HKFT.h" #include "cantera/thermo/PDSS_Water.h" diff --git a/src/thermo/VPStandardStateTP.cpp b/src/thermo/VPStandardStateTP.cpp index 2ebc436b9..9de697a5c 100644 --- a/src/thermo/VPStandardStateTP.cpp +++ b/src/thermo/VPStandardStateTP.cpp @@ -5,11 +5,9 @@ * thermodynamic properties (see \ref thermoprops and * class \link Cantera::VPStandardStateTP VPStandardStateTP\endlink). */ -/* - * Copyright (2005) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/VPStandardStateTP.h" #include "cantera/thermo/PDSS.h" diff --git a/src/thermo/WaterProps.cpp b/src/thermo/WaterProps.cpp index 492ba4a66..e38326238 100644 --- a/src/thermo/WaterProps.cpp +++ b/src/thermo/WaterProps.cpp @@ -1,11 +1,9 @@ /** * @file WaterProps.cpp */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/WaterProps.h" #include "cantera/base/ctml.h" diff --git a/src/thermo/WaterPropsIAPWS.cpp b/src/thermo/WaterPropsIAPWS.cpp index d77ff6385..9d9d545ce 100644 --- a/src/thermo/WaterPropsIAPWS.cpp +++ b/src/thermo/WaterPropsIAPWS.cpp @@ -4,11 +4,10 @@ * from the IAPWS 1995 Formulation based on the steam tables thermodynamic * basis (See class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/WaterPropsIAPWS.h" #include "cantera/base/ctexceptions.h" #include "cantera/base/stringUtils.h" diff --git a/src/thermo/WaterPropsIAPWSphi.cpp b/src/thermo/WaterPropsIAPWSphi.cpp index c84fa5ca2..f746c116b 100644 --- a/src/thermo/WaterPropsIAPWSphi.cpp +++ b/src/thermo/WaterPropsIAPWSphi.cpp @@ -4,11 +4,10 @@ * model (see class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink and * class \link Cantera::WaterPropsIAPWSphi WaterPropsIAPWSphi \endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/thermo/WaterPropsIAPWSphi.h" #include "cantera/base/global.h" diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp index 42fe2efa4..3ae8fe6dc 100644 --- a/src/thermo/WaterSSTP.cpp +++ b/src/thermo/WaterSSTP.cpp @@ -3,11 +3,9 @@ * Definitions for a ThermoPhase class consisting of pure water (see \ref thermoprops * and class \link Cantera::WaterSSTP WaterSSTP\endlink). */ -/* - * Copyright (2006) Sandia Corporation. Under the terms of - * Contract DE-AC04-94AL85000 with Sandia Corporation, the - * U.S. Government retains certain rights in this software. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/thermo/WaterSSTP.h" #include "cantera/thermo/ThermoFactory.h" diff --git a/src/transport/DustyGasTransport.cpp b/src/transport/DustyGasTransport.cpp index 2ed6cd013..7c2b3615c 100644 --- a/src/transport/DustyGasTransport.cpp +++ b/src/transport/DustyGasTransport.cpp @@ -3,10 +3,8 @@ * Implementation file for class DustyGasTransport */ -/* - * Copyright 2003 California Institute of Technology - * See file License.txt for licensing information - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/transport/DustyGasTransport.h" #include "cantera/base/stringUtils.h" diff --git a/src/transport/MMCollisionInt.cpp b/src/transport/MMCollisionInt.cpp index 5d233ec04..f65da497f 100644 --- a/src/transport/MMCollisionInt.cpp +++ b/src/transport/MMCollisionInt.cpp @@ -1,7 +1,9 @@ /** * @file MMCollisionInt.cpp */ -// Copyright 2001 California Institute of Technology */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "MMCollisionInt.h" #include "cantera/base/utilities.h" diff --git a/src/transport/MMCollisionInt.h b/src/transport/MMCollisionInt.h index d7a9b374b..2b5b835ad 100644 --- a/src/transport/MMCollisionInt.h +++ b/src/transport/MMCollisionInt.h @@ -2,7 +2,9 @@ * @file MMCollisionInt.h * Monk and Monchick collision integrals */ -// Copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef CT_MMCOLLISIONINT_H #define CT_MMCOLLISIONINT_H diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp index b84aca997..427371730 100644 --- a/src/transport/MixTransport.cpp +++ b/src/transport/MixTransport.cpp @@ -2,7 +2,9 @@ * @file MixTransport.cpp * Mixture-averaged transport properties for ideal gas mixtures. */ -// copyright 2001 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/transport/MixTransport.h" #include "cantera/base/stringUtils.h" diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp index 7be5c765f..d822ace53 100644 --- a/src/transport/MultiTransport.cpp +++ b/src/transport/MultiTransport.cpp @@ -2,10 +2,9 @@ * @file MultiTransport.cpp * Implementation file for class MultiTransport */ -/* - * Copyright 2001 California Institute of Technology - * See file License.txt for licensing information - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/transport/MultiTransport.h" #include "cantera/thermo/IdealGasPhase.h" diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp index 371fb17d8..7cc9bf979 100644 --- a/src/transport/SolidTransport.cpp +++ b/src/transport/SolidTransport.cpp @@ -4,7 +4,9 @@ * of ions within solid phases * (see \ref tranprops and \link Cantera::SolidTransport SolidTransport \endlink). */ -// copyright 2008 California Institute of Technology + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/transport/SolidTransport.h" #include "cantera/transport/SolidTransportData.h" diff --git a/src/zeroD/ConstPressureReactor.cpp b/src/zeroD/ConstPressureReactor.cpp index 36e4cf9c7..48dc19abd 100644 --- a/src/zeroD/ConstPressureReactor.cpp +++ b/src/zeroD/ConstPressureReactor.cpp @@ -1,6 +1,7 @@ //! @file ConstPressureReactor.cpp A constant pressure zero-dimensional reactor -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/zeroD/ConstPressureReactor.h" #include "cantera/zeroD/FlowDevice.h" diff --git a/src/zeroD/FlowReactor.cpp b/src/zeroD/FlowReactor.cpp index ee9521f6d..6e728a5c6 100644 --- a/src/zeroD/FlowReactor.cpp +++ b/src/zeroD/FlowReactor.cpp @@ -1,6 +1,7 @@ //! @file FlowReactor.cpp A steady-state plug flow reactor -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/zeroD/FlowReactor.h" #include "cantera/base/global.h" diff --git a/src/zeroD/IdealGasConstPressureReactor.cpp b/src/zeroD/IdealGasConstPressureReactor.cpp index c460b4763..260466599 100644 --- a/src/zeroD/IdealGasConstPressureReactor.cpp +++ b/src/zeroD/IdealGasConstPressureReactor.cpp @@ -1,6 +1,7 @@ //! @file ConstPressureReactor.cpp A constant pressure zero-dimensional reactor -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/zeroD/IdealGasConstPressureReactor.h" #include "cantera/zeroD/FlowDevice.h" diff --git a/src/zeroD/Reactor.cpp b/src/zeroD/Reactor.cpp index d16fb0121..531b640ab 100644 --- a/src/zeroD/Reactor.cpp +++ b/src/zeroD/Reactor.cpp @@ -1,6 +1,7 @@ //! @file Reactor.cpp A zero-dimensional reactor -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/zeroD/Reactor.h" #include "cantera/zeroD/FlowDevice.h" diff --git a/src/zeroD/ReactorBase.cpp b/src/zeroD/ReactorBase.cpp index fe1e5f592..f0c41850a 100644 --- a/src/zeroD/ReactorBase.cpp +++ b/src/zeroD/ReactorBase.cpp @@ -1,6 +1,7 @@ //! @file ReactorBase.cpp -// Copyright 2001 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/zeroD/ReactorBase.h" #include "cantera/zeroD/FlowDevice.h" diff --git a/src/zeroD/ReactorFactory.cpp b/src/zeroD/ReactorFactory.cpp index f96379c31..d30a08651 100644 --- a/src/zeroD/ReactorFactory.cpp +++ b/src/zeroD/ReactorFactory.cpp @@ -1,6 +1,7 @@ //! @file ReactorFactory.cpp -// Copyright 2006 California Institute of Technology +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/zeroD/ReactorFactory.h" #include "cantera/zeroD/Reservoir.h" diff --git a/test_problems/CpJump/CpJump.cpp b/test_problems/CpJump/CpJump.cpp index 088e17518..5b690002f 100644 --- a/test_problems/CpJump/CpJump.cpp +++ b/test_problems/CpJump/CpJump.cpp @@ -1,6 +1,5 @@ -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/IdealGasMix.h" diff --git a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp index 17e276dac..f8570b185 100644 --- a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp +++ b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp @@ -1,6 +1,5 @@ -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/equil/vcs_MultiPhaseEquil.h" diff --git a/test_problems/VPsilane_test/silane_equil.cpp b/test_problems/VPsilane_test/silane_equil.cpp index 420eb0e91..31114ef32 100644 --- a/test_problems/VPsilane_test/silane_equil.cpp +++ b/test_problems/VPsilane_test/silane_equil.cpp @@ -1,6 +1,5 @@ -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/IdealGasMix.h" #include "cantera/thermo/IdealSolnGasVPSS.h" diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp index 86412619d..62d214cfd 100644 --- a/test_problems/cathermo/VPissp/ISSPTester.cpp +++ b/test_problems/cathermo/VPissp/ISSPTester.cpp @@ -1,12 +1,9 @@ /** * @file ISSPTester.cpp */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. // Example // diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp index e21c1c109..c96ba0d1a 100644 --- a/test_problems/cathermo/ims/IMSTester.cpp +++ b/test_problems/cathermo/ims/IMSTester.cpp @@ -1,12 +1,9 @@ /** * @file IMSTester.cpp */ -/* - * Copyright 2005 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. // Example // diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp index ffb24c78b..1ed21a19c 100644 --- a/test_problems/cathermo/issp/ISSPTester.cpp +++ b/test_problems/cathermo/issp/ISSPTester.cpp @@ -1,12 +1,9 @@ /** * @file ISSPTester.cpp */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. // Example // diff --git a/test_problems/cxx_ex/equil_example1.cpp b/test_problems/cxx_ex/equil_example1.cpp index 06603db40..2d3088084 100644 --- a/test_problems/cxx_ex/equil_example1.cpp +++ b/test_problems/cxx_ex/equil_example1.cpp @@ -1,10 +1,12 @@ ///////////////////////////////////////////////////////////// // // chemical equilibrium -// copyright California Institute of Technology 2002 // ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "example_utils.h" #include "cantera/IdealGasMix.h" diff --git a/test_problems/cxx_ex/kinetics_example1.cpp b/test_problems/cxx_ex/kinetics_example1.cpp index 0d058986a..4f7da168b 100644 --- a/test_problems/cxx_ex/kinetics_example1.cpp +++ b/test_problems/cxx_ex/kinetics_example1.cpp @@ -2,10 +2,11 @@ // // zero-dimensional kinetics example program // -// copyright California Institute of Technology 2002 -// ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/zerodim.h" #include "cantera/IdealGasMix.h" #include "example_utils.h" diff --git a/test_problems/cxx_ex/kinetics_example3.cpp b/test_problems/cxx_ex/kinetics_example3.cpp index c1775ba50..928ff20d4 100644 --- a/test_problems/cxx_ex/kinetics_example3.cpp +++ b/test_problems/cxx_ex/kinetics_example3.cpp @@ -2,10 +2,11 @@ // // zero-dimensional kinetics example program // -// copyright California Institute of Technology 2006 -// ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/zerodim.h" #include "cantera/IdealGasMix.h" #include "example_utils.h" diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp index 23d4741ed..6d7d79233 100644 --- a/test_problems/cxx_ex/rxnpath_example1.cpp +++ b/test_problems/cxx_ex/rxnpath_example1.cpp @@ -2,10 +2,11 @@ // // reaction path diagrams // -// copyright California Institute of Technology 2002 -// ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/zerodim.h" #include "example_utils.h" #include "cantera/reactionpaths.h" diff --git a/test_problems/cxx_ex/transport_example1.cpp b/test_problems/cxx_ex/transport_example1.cpp index 9e0e3570f..6863be957 100644 --- a/test_problems/cxx_ex/transport_example1.cpp +++ b/test_problems/cxx_ex/transport_example1.cpp @@ -2,10 +2,11 @@ // // mixture-averaged transport properties // -// copyright California Institute of Technology 2002 -// ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/transport.h" #include "example_utils.h" #include "cantera/IdealGasMix.h" diff --git a/test_problems/cxx_ex/transport_example2.cpp b/test_problems/cxx_ex/transport_example2.cpp index cbaf5638e..6747a3673 100644 --- a/test_problems/cxx_ex/transport_example2.cpp +++ b/test_problems/cxx_ex/transport_example2.cpp @@ -2,10 +2,11 @@ // // mixture-averaged transport properties // -// copyright California Institute of Technology 2002 -// ///////////////////////////////////////////////////////////// +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + #include "cantera/transport.h" #include "example_utils.h" #include "cantera/IdealGasMix.h" diff --git a/test_problems/shared/TemperatureTable.h b/test_problems/shared/TemperatureTable.h index 902166e49..7b9538866 100644 --- a/test_problems/shared/TemperatureTable.h +++ b/test_problems/shared/TemperatureTable.h @@ -1,8 +1,5 @@ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000, there is a non-exclusive license for use of this - * work by or on behalf of the U.S. Government. - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #ifndef TEMPERATURE_TABLE_H #define TEMPERATURE_TABLE_H diff --git a/test_problems/silane_equil/silane_equil.cpp b/test_problems/silane_equil/silane_equil.cpp index e39b4e4e6..ec4c4fddf 100644 --- a/test_problems/silane_equil/silane_equil.cpp +++ b/test_problems/silane_equil/silane_equil.cpp @@ -1,6 +1,5 @@ -/* - * Copyright 2002 California Institute of Technology - */ +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. #include "cantera/IdealGasMix.h" diff --git a/test_problems/surfSolverTest/surfaceSolver.cpp b/test_problems/surfSolverTest/surfaceSolver.cpp index 09ed96471..731ea7d82 100644 --- a/test_problems/surfSolverTest/surfaceSolver.cpp +++ b/test_problems/surfSolverTest/surfaceSolver.cpp @@ -2,12 +2,10 @@ * @file surfaceSolver.cpp * */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + // Example // // Read a surface growth mechanism and calculate the solution diff --git a/test_problems/surfSolverTest/surfaceSolver2.cpp b/test_problems/surfSolverTest/surfaceSolver2.cpp index a2adf6a70..f053b630b 100644 --- a/test_problems/surfSolverTest/surfaceSolver2.cpp +++ b/test_problems/surfSolverTest/surfaceSolver2.cpp @@ -2,12 +2,10 @@ * @file surfaceSolver2.cpp * */ -/* - * Copyright 2004 Sandia Corporation. Under the terms of Contract - * DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government - * retains certain rights in this software. - * See file License.txt for licensing information. - */ + +// This file is part of Cantera. See License.txt in the top-level directory or +// at http://www.cantera.org/license.txt for license and copyright information. + // Example // // Read a surface growth mechanism and calculate the solution