research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed MSVC-specific compiler warning suppression

Browse source
This commit is contained in:
Ray Speth 2012-01-17 04:09:18 +00:00
parent 32bcd0314f
commit 453576f0ad
142 changed files with 0 additions and 818 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cantera/clib/src/clib_defs.h
View file

@ -18,9 +18,6 @@
#define DLL_EXPORT __declspec(dllexport)
#endif
#pragma warning(disable:4786)
#pragma warning(disable:4267)
#pragma warning(disable:4503)
#else
// On other platforms, we turn off the DLL macros.
#define DLL_EXPORT

5
Cantera/clib/src/ct.cpp
View file

@ -7,11 +7,6 @@
* Cantera objects are stored and referenced by integers - no
* pointers are passed to or from the calling application.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#define CANTERA_USE_INTERNAL
#include "ct.h"

7
Cantera/clib/src/ctbdry.cpp
View file

@ -4,13 +4,6 @@
#define CANTERA_USE_INTERNAL
#include "ctbdry.h"
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
// Cantera includes
#include "kernel/OneDim.h"
#include "kernel/Inlet1D.h"

6
Cantera/clib/src/ctfunc.cpp
View file

@ -1,12 +1,6 @@
/**
* @file ctfunc.cpp
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4996)
#endif
#define CANTERA_USE_INTERNAL
#include "ctfunc.h"

7
Cantera/clib/src/ctonedim.cpp
View file

@ -1,13 +1,6 @@
/**
* @file ctonedim.cpp
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4800)
#endif
#define CANTERA_USE_INTERNAL
#include "ctonedim.h"

5
Cantera/clib/src/ctreactor.cpp
View file

@ -1,11 +1,6 @@
/**
* @file ctreactor.cpp
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#define CANTERA_USE_INTERNAL
#include "ctreactor.h"

6
Cantera/clib/src/ctsurf.cpp
View file

@ -1,12 +1,6 @@
/**
* @file ctsurf.cpp
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
// clib header information
#define CANTERA_USE_INTERNAL
#include "ctsurf.h"

5
Cantera/clib/src/ctxml.cpp
View file

@ -1,11 +1,6 @@
/**
* @file ctxml.cpp
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#define CANTERA_USE_INTERNAL
#include "ctxml.h"

11
Cantera/cxx/demos/flamespeed/flamespeed.cpp
View file

@ -1,14 +1,3 @@
//
#ifdef WIN32
#pragma warning(disable:4786)
/*Warning messages that are identified as Warning C4786: are created
when MSVC generates extremely long names that it uses for debugging
purposes. The long names are generated by the template expansion
process and the warning messages normally can be ignored. Since these
warnings tend to hide more interesting warning/error messages, you may
wish to suppress the warning*/
#endif
#include <cantera/Cantera.h>
#include <cantera/onedim.h>
#include <cantera/IdealGasMix.h>

6
Cantera/cxx/demos/kinetics1/kinetics1.cpp
View file

@ -6,12 +6,6 @@
//
/////////////////////////////////////////////////////////////
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include <cantera/Cantera.h>
#include <cantera/zerodim.h>
#include <cantera/IdealGasMix.h>

9
Cantera/cxx/src/cxxutils.cpp
View file

@ -1,16 +1,7 @@
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "kernel/ThermoPhase.h"
#include <stdio.h>
using namespace std;
namespace Cantera {
}

6
Cantera/fortran/f77demos/demo_ftnlib.cpp
View file

@ -25,12 +25,6 @@
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
// add any other Cantera header files you need here
#include <cantera/Cantera.h>
#include <cantera/IdealGasMix.h>

6
Cantera/fortran/src/fct.cpp
View file

@ -6,12 +6,6 @@
* Cantera objects are stored and referenced by integers - no
* pointers are passed to or from the calling application.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
// Cantera includes
#include "kernel/equil.h"
#include "kernel/KineticsFactory.h"

2
Cantera/fortran/src/flib_defs.h
View file

@ -5,8 +5,6 @@
#ifdef WIN32
#define DLL_IMPORT __declspec(dllimport)
#define DLL_EXPORT __declspec(dllexport)
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#else
#define DLL_EXPORT
#define DLL_IMPORT

6
Cantera/python/src/pycantera.cpp
View file

@ -5,12 +5,6 @@
*
*/
// turn off warnings about long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "cantera/kernel/config.h"
#include "Python.h"

3
Cantera/src/base/checkFinite.cpp
View file

@ -29,11 +29,8 @@
#ifdef WIN32
#include <float.h>
#pragma warning(disable:4290)
#pragma warning(disable:4996)
#endif
using namespace std;
namespace mdp {

7
Cantera/src/base/ct2ctml.cpp
View file

@ -5,13 +5,6 @@
*/
// Copyright 2001-2005 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4996)
#endif
#include "ct_defs.h"
#include "ctexceptions.h"
#include "ctml.h"

1
Cantera/src/base/ct_defs.h
View file

@ -34,7 +34,6 @@ namespace Cantera {
#ifdef WIN32
#define TYPENAME_KEYWORD
#pragma warning(disable:4267)
#else
//! create a define for the typename command
#define TYPENAME_KEYWORD typename

7
Cantera/src/base/ctml.cpp
View file

@ -5,13 +5,6 @@
*/
// Copyright 2002 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ctml.h"
//@{

4
Cantera/src/base/mdp_allo.cpp
View file

@ -19,10 +19,6 @@
using namespace std;
#ifdef WIN32
#pragma warning(disable:4996)
#endif
namespace mdp {
/*
* Allocate global storage for 2 debugging ints that are used in IO of

4
Cantera/src/base/mdp_allo.h
View file

@ -14,10 +14,6 @@
#ifndef MDP_ALLO_H
#define MDP_ALLO_H
#ifdef WIN32
#pragma warning(disable:4290)
#endif
#include <stdexcept>
/*

5
Cantera/src/base/misc.cpp
View file

@ -9,11 +9,6 @@
* logs
* HTML_logs
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4996)
#endif
// RFB:TODO May need OS specifc include to use varargs.h instead
#include <stdarg.h>

6
Cantera/src/base/plots.cpp
View file

@ -3,12 +3,6 @@
*/
// Copyright 2002 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "plots.h"
using namespace std;

3
Cantera/src/base/stringUtils.cpp
View file

@ -9,9 +9,6 @@
#include "ct_defs.h"
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4996)
#define SNPRINTF _snprintf
#else
#define SNPRINTF snprintf

4
Cantera/src/base/utilities.h
View file

@ -18,10 +18,6 @@
#include "ct_defs.h"
#ifdef WIN32
#pragma warning(disable:4996)
#endif
//! Unary operator to multiply the argument by a constant.
/*!
* The form of this operator is designed for use by std::transform.

8
Cantera/src/base/xml.cpp
View file

@ -6,14 +6,6 @@
*/
// Copyright 2001 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4996)
#endif
#include "config.h"
#ifdef HAS_SSTREAM
#include <sstream>

5
Cantera/src/converters/CKParser.cpp
View file

@ -5,11 +5,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings about truncating long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <numeric>
#include <algorithm>
#include <fstream>

5
Cantera/src/converters/CKParser.h
View file

@ -5,14 +5,9 @@
// Copyright 2001 California Institute of Technology
#ifndef CKR_CKPARSER_H
#define CKR_CKPARSER_H
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <fstream>
#include <string>
#include <iostream>

6
Cantera/src/converters/CKReader.cpp
View file

@ -5,12 +5,6 @@
// Copyright 2001 California Institute of Technology
// disable warning about long names in Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <fstream>
#include <string>
using namespace std;

5
Cantera/src/converters/CKReader.h
View file

@ -5,14 +5,9 @@
// Copyright 2001 California Institute of Technology
#ifndef CKR_CKRREADER_H
#define CKR_CKRREADER_H
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <fstream>
#include <iostream>
#include <string>

5
Cantera/src/converters/Reaction.cpp
View file

@ -5,11 +5,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings about truncating long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "Reaction.h"
#include <iostream>
#include <stdio.h>

6
Cantera/src/converters/atomicWeightDB.cpp
View file

@ -7,12 +7,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings about truncating long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <map>
#include <string>
#include <iostream>

5
Cantera/src/converters/ck2ct.cpp
View file

@ -2,11 +2,6 @@
* @file ck2ct.cpp
* Convert CK-format reaction mechanism files to Cantera input format.
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include <iostream>
#include <string>
#include <ctype.h>

6
Cantera/src/converters/ckr_utils.cpp
View file

@ -5,12 +5,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings about truncating long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <ctype.h>
#include <math.h>

4
Cantera/src/converters/ckr_utils.h
View file

@ -8,10 +8,6 @@
#ifndef CKR_UTILS_H
#define CKR_UTILS_H
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <math.h>
#include <string>
#include <map>

6
Cantera/src/converters/thermoFunctions.cpp
View file

@ -6,12 +6,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings about truncating long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <math.h>
#include "thermoFunctions.h"
#include <iostream>

5
Cantera/src/converters/thermoFunctions.h
View file

@ -7,14 +7,9 @@
// Copyright 2001 California Institute of Technology
#ifndef CKR_THERMOFUNCTIONS_H
#define CKR_THERMOFUNCTIONS_H
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "Species.h"
namespace ckr {

6
Cantera/src/converters/writelog.cpp
View file

@ -5,12 +5,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings about truncating long names under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include <cstdio>
#include "writelog.h"

5
Cantera/src/equil/ChemEquil.cpp
View file

@ -6,11 +6,6 @@
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include <vector>
#include "ChemEquil.h"

4
Cantera/src/equil/vcs_solve_TP.cpp
View file

@ -20,10 +20,6 @@
#include "clockWC.h"
#ifdef WIN32
#pragma warning(disable:4996)
#endif
using namespace std;
namespace VCSnonideal {

4
Cantera/src/kinetics/AqueousKinetics.cpp
View file

@ -10,10 +10,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "AqueousKinetics.h"
#include "ReactionData.h"

6
Cantera/src/kinetics/FalloffFactory.cpp
View file

@ -3,12 +3,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "FalloffFactory.h"
#include "ctexceptions.h"

7
Cantera/src/kinetics/GRI_30_Kinetics.cpp
View file

@ -6,13 +6,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "GRI_30_Kinetics.h"
#include "ReactionData.h"

7
Cantera/src/kinetics/GasKinetics.cpp
View file

@ -7,13 +7,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "GasKinetics.h"
#include "ReactionData.h"

5
Cantera/src/kinetics/Group.cpp
View file

@ -8,11 +8,6 @@
// reaction path analysis support
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "Group.h"
#include <algorithm>

6
Cantera/src/kinetics/ImplicitSurfChem.cpp
View file

@ -6,12 +6,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ImplicitSurfChem.h"
#include "Integrator.h"
#include "solveSP.h"

6
Cantera/src/kinetics/ImplicitSurfChem.h
View file

@ -6,15 +6,9 @@
*/
// Copyright 2001 California Institute of Technology
#ifndef CT_IMPSURFCHEM_H
#define CT_IMPSURFCHEM_H
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "FuncEval.h"
#include "Integrator.h"
#include "InterfaceKinetics.h"

7
Cantera/src/kinetics/InterfaceKinetics.cpp
View file

@ -5,13 +5,6 @@
// Copyright 2002 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "InterfaceKinetics.h"
#include "EdgeKinetics.h"
#include "SurfPhase.h"

5
Cantera/src/kinetics/KineticsFactory.cpp
View file

@ -3,11 +3,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "KineticsFactory.h"
#include "GasKinetics.h"

5
Cantera/src/kinetics/ReactionPath.cpp
View file

@ -4,11 +4,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ReactionPath.h"
#include "Kinetics.h"
#include "reaction_defs.h"

7
Cantera/src/kinetics/ReactionStoichMgr.cpp
View file

@ -5,13 +5,6 @@
///
//------------------------------------------------
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ReactionStoichMgr.h"
#include "StoichManager.h"
#include "ctexceptions.h"

5
Cantera/src/kinetics/importKinetics.cpp
View file

@ -11,11 +11,6 @@
*/
// Copyright 2002 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "importKinetics.h"
#include "mix_defs.h"
#include <time.h>

5
Cantera/src/numerics/BandMatrix.cpp
View file

@ -6,11 +6,6 @@
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "BandMatrix.h"
#include "ctlapack.h"
#include "utilities.h"

6
Cantera/src/numerics/CVodeInt.h
View file

@ -3,15 +3,9 @@
*/
// Copyright 2001 California Institute of Technology
#ifndef CT_CVODEINT_H
#define CT_CVODEINT_H
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "Integrator.h"
#include "FuncEval.h"
#include "ctexceptions.h"

6
Cantera/src/numerics/CVodesIntegrator.h
View file

@ -3,17 +3,11 @@
*/
// Copyright 2005 California Institute of Technology
#ifndef CT_CVODESWRAPPER_H
#define CT_CVODESWRAPPER_H
#ifdef HAS_SUNDIALS
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "Integrator.h"
#include "FuncEval.h"
#include "ctexceptions.h"

5
Cantera/src/numerics/DenseMatrix.cpp
View file

@ -4,11 +4,6 @@
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "ctlapack.h"
#include "utilities.h"

6
Cantera/src/numerics/Func1.h
View file

@ -9,12 +9,6 @@
#undef DEBUG_FUNC
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include <iostream>

5
Cantera/src/numerics/FuncEval.h
View file

@ -8,11 +8,6 @@
#ifndef CT_FUNCEVAL_H
#define CT_FUNCEVAL_H
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
namespace Cantera {

7
Cantera/src/numerics/Integrator.h
View file

@ -10,18 +10,11 @@
#ifndef CT_INTEGRATOR_H
#define CT_INTEGRATOR_H
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "FuncEval.h"
#include "ct_defs.h"
#include "global.h"
namespace Cantera {
const int DIAG = 1;

5
Cantera/src/numerics/ResidEval.h
View file

@ -7,11 +7,6 @@
#ifndef CT_RESIDEVAL_H
#define CT_RESIDEVAL_H
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "ctexceptions.h"

5
Cantera/src/numerics/funcs.cpp
View file

@ -7,11 +7,6 @@
* See file License.txt for licensing information
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include <vector>
#include <algorithm>

4
Cantera/src/numerics/sort.cpp
View file

@ -2,10 +2,6 @@
* @file sort.cpp
*/
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "sort.h"
namespace Cantera {

6
Cantera/src/oneD/MultiJac.cpp
View file

@ -8,12 +8,6 @@
* Copyright 2002 California Institute of Technology
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "MultiJac.h"
using namespace std;

5
Cantera/src/oneD/MultiNewton.cpp
View file

@ -8,11 +8,6 @@
* Copyright 2001 California Institute of Technology
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include <vector>
using namespace std;

6
Cantera/src/oneD/OneDim.cpp
View file

@ -1,9 +1,3 @@
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "MultiJac.h"
#include "MultiNewton.h"
#include "OneDim.h"

6
Cantera/src/oneD/Sim1D.cpp
View file

@ -1,9 +1,3 @@
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
/**
* @file Sim1D.cpp
*/

4
Cantera/src/oneD/Sim1D.h
View file

@ -5,10 +5,6 @@
#ifndef CT_SIM1D_H
#define CT_SIM1D_H
#ifdef WIN32
#pragma warning(disable:4996)
#endif
#include "OneDim.h"
#include "funcs.h"

8
Cantera/src/oneD/StFlow.cpp
View file

@ -3,14 +3,6 @@
*/
// Copyright 2002 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#pragma warning(disable:4267)
#endif
#include <stdlib.h>
#include <time.h>

6
Cantera/src/oneD/boundaries1D.cpp
View file

@ -3,12 +3,6 @@
*/
// Copyright 2002-3 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "Inlet1D.h"
using namespace std;

5
Cantera/src/oneD/newton_utils.cpp
View file

@ -2,11 +2,6 @@
* @file newton_utils.cpp
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "Domain1D.h"

7
Cantera/src/oneD/refine.cpp
View file

@ -1,10 +1,3 @@
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include <map>
#include <algorithm>
#include "Domain1D.h"

5
Cantera/src/spectra/rotor.cpp
View file

@ -2,11 +2,6 @@
* @file rotor.cpp
*
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "rotor.h"

6
Cantera/src/thermo/ConstDensityThermo.cpp
View file

@ -6,12 +6,6 @@
*/
// Copyright 2002 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "mix_defs.h"
#include "ConstDensityThermo.h"

5
Cantera/src/thermo/Constituents.cpp
View file

@ -5,11 +5,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "Constituents.h"
#include "Elements.h"
using namespace std;

5
Cantera/src/thermo/Elements.cpp
View file

@ -8,11 +8,6 @@
*/
// Copyright 2003 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "Elements.h"
#include "xml.h"
#include "ctml.h"

6
Cantera/src/thermo/IdealGasPhase.cpp
View file

@ -1,15 +1,9 @@
/**
*
* @file IdealGasPhase.cpp
* ThermoPhase object for the ideal gas equation of
* state - workhorse for %Cantera (see \ref thermoprops
* and class \link Cantera::IdealGasPhase IdealGasPhase\endlink).
*
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "mix_defs.h"

5
Cantera/src/thermo/IdealSolnGasVPSS.cpp
View file

@ -11,11 +11,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "IdealSolnGasVPSS.h"
#include "VPSSMgr.h"

5
Cantera/src/thermo/LatticePhase.cpp
View file

@ -10,11 +10,6 @@
#include "config.h"
#ifdef WITH_LATTICE_SOLID
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "mix_defs.h"
#include "LatticePhase.h"

5
Cantera/src/thermo/LatticeSolidPhase.cpp
View file

@ -2,11 +2,6 @@
* @file LatticeSolidPhase.cpp
*/
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "config.h"
#ifdef WITH_LATTICE_SOLID

5
Cantera/src/thermo/PDSSFactory.cpp
View file

@ -6,11 +6,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "SpeciesThermoFactory.h"
using namespace std;

5
Cantera/src/thermo/Phase.cpp
View file

@ -7,11 +7,6 @@
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "Phase.h"
#include "vec_functions.h"

8
Cantera/src/thermo/SpeciesThermoFactory.cpp
View file

@ -6,11 +6,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "SpeciesThermoFactory.h"
using namespace std;
@ -39,7 +34,6 @@ using namespace std;
using namespace ctml;
namespace Cantera {
SpeciesThermoFactory* SpeciesThermoFactory::s_factory = 0;
@ -47,9 +41,7 @@ namespace Cantera {
#if defined(THREAD_SAFE_CANTERA)
boost::mutex SpeciesThermoFactory::species_thermo_mutex ;
#endif
//! Examine the types of species thermo parameterizations,
//! and return a flag indicating the type of reference state thermo manager
//! that will be needed in order to evaluate them all.

5
Cantera/src/thermo/State.h
View file

@ -16,12 +16,7 @@
#include "ct_defs.h"
#include "utilities.h"
#ifdef WIN32
#pragma warning(disable:4996)
#endif
namespace Cantera {
//! Manages the independent variables of temperature, mass density,
//! and species mass/mole fraction that define the thermodynamic

7
Cantera/src/thermo/StoichSubstance.cpp
View file

@ -1,5 +1,4 @@
/**
*
* @file StoichSubstance.cpp
* This file contains the class definitions for the StoichSubstance
* ThermoPhase class.
@ -7,11 +6,6 @@
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ct_defs.h"
#include "mix_defs.h"
#include "StoichSubstance.h"
@ -19,7 +13,6 @@
namespace Cantera {
// Default empty constructor
StoichSubstance::StoichSubstance() :
m_kk(0),

6
Cantera/src/thermo/SurfPhase.cpp
View file

@ -7,12 +7,6 @@
*/
// Copyright 2002 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "SurfPhase.h"
#include "EdgePhase.h"
#include "ThermoFactory.h"

5
Cantera/src/thermo/ThermoFactory.cpp
View file

@ -6,11 +6,6 @@
*/
// Copyright 2001 California Institute of Technology
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "ThermoFactory.h"
#include "speciesThermoTypes.h"

6
Cantera/src/thermo/ThermoPhase.cpp
View file

@ -7,12 +7,6 @@
// Copyright 2002 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ThermoPhase.h"
#include <iomanip>

5
Cantera/src/thermo/VPSSMgr.cpp
View file

@ -11,11 +11,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPSSMgr.h"
#include "VPStandardStateTP.h"

6
Cantera/src/thermo/VPSSMgrFactory.cpp
View file

@ -10,14 +10,9 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
#ifdef WIN32
#pragma warning(disable:4786)
#endif
#include "SpeciesThermo.h"
#include "VPSSMgr.h"
#include "VPSSMgrFactory.h"
@ -45,7 +40,6 @@
using namespace ctml;
using namespace std;
namespace Cantera {
VPSSMgrFactory* VPSSMgrFactory::s_factory = 0;

5
Cantera/src/thermo/VPSSMgr_ConstVol.cpp
View file

@ -11,11 +11,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPSSMgr_ConstVol.h"
#include "xml.h"

7
Cantera/src/thermo/VPSSMgr_General.cpp
View file

@ -11,11 +11,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPSSMgr_General.h"
#include "PDSS.h"
@ -33,7 +28,6 @@ using namespace std;
namespace Cantera {
VPSSMgr_General::VPSSMgr_General(VPStandardStateTP *vp_ptr,
SpeciesThermo *spth) :
VPSSMgr(vp_ptr, spth)
@ -45,7 +39,6 @@ namespace Cantera {
m_useTmpRefStateStorage = true;
}
VPSSMgr_General::~VPSSMgr_General()
{
}

6
Cantera/src/thermo/VPSSMgr_IdealGas.cpp
View file

@ -11,11 +11,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPSSMgr_IdealGas.h"
#include "utilities.h"
@ -36,7 +31,6 @@ namespace Cantera {
m_useTmpStandardStateStorage = true;
}
VPSSMgr_IdealGas::~VPSSMgr_IdealGas()
{
}

5
Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp
View file

@ -13,11 +13,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPSSMgr_Water_ConstVol.h"
#include "PDSS_Water.h"

5
Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp
View file

@ -13,11 +13,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPSSMgr_Water_HKFT.h"
#include "PDSS_Water.h"

5
Cantera/src/thermo/VPStandardStateTP.cpp
View file

@ -10,11 +10,6 @@
* Contract DE-AC04-94AL85000 with Sandia Corporation, the
* U.S. Government retains certain rights in this software.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "VPStandardStateTP.h"
#include "VPSSMgr.h"

6
Cantera/src/thermo/phasereport.cpp
View file

@ -5,12 +5,6 @@
// Copyright 2001 California Institute of Technology
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ThermoPhase.h"
#include "PureFluidPhase.h"
#include "mix_defs.h"

10
Cantera/src/transport/AqueousTransport.cpp
View file

@ -2,11 +2,6 @@
* @file MixTransport.cpp
* Mixture-averaged transport properties for ideal gas mixtures.
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ThermoPhase.h"
#include "AqueousTransport.h"
@ -27,12 +22,10 @@ using namespace std;
*/
#define MIN_X 1.e-20
namespace Cantera {
//////////////////// class AqueousTransport methods //////////////
AqueousTransport::AqueousTransport() :
m_nsp(0),
m_tmin(-1.0),
@ -58,11 +51,8 @@ namespace Cantera {
m_debug(false),
m_nDim(1)
{
}
// Initialize the object
/*
* This is where we dimension everything.

9
Cantera/src/transport/DustyGasTransport.cpp
View file

@ -10,12 +10,6 @@
* See file License.txt for licensing information
*/
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "ThermoPhase.h"
#include "DustyGasTransport.h"
@ -27,13 +21,10 @@ using namespace std;
*/
#define MIN_X 1.e-20
namespace Cantera {
//////////////////// class DustyGasTransport methods //////////////
DustyGasTransport::DustyGasTransport(thermo_t* thermo)
: Transport(thermo),
m_temp(-1.0),

8
Cantera/src/transport/L_matrix.h
View file

@ -8,19 +8,11 @@
#ifndef CT_LMATRIX_H
#define CT_LMATRIX_H
// turn off warnings under Windows
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "DenseMatrix.h"
#include "ct_defs.h"
#include <vector>
/////////////////////////////////////////////////////////////////////
namespace Cantera {

5
Cantera/src/transport/MMCollisionInt.cpp
View file

@ -3,11 +3,6 @@
*/
// Copyright 2001 California Institute of Technology */
#ifdef WIN32
#pragma warning(disable:4786)
#pragma warning(disable:4503)
#endif
#include "MMCollisionInt.h"
#include "utilities.h"
#include "polyfit.h"

Some files were not shown because too many files have changed in this diff Show more