ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.hpp
(Generate patch)

Comparing branches/development/src/io/Globals.hpp (file contents):
Revision 1714 by gezelter, Sat May 19 18:12:46 2012 UTC vs.
Revision 1729 by jmarr, Wed May 30 16:08:07 2012 UTC

# Line 107 | Line 107 | namespace OpenMD {
107      DeclareParameter(ForceFieldFileName, std::string);
108      DeclareParameter(SurfaceTension, RealType);
109      DeclareParameter(PrintPressureTensor, bool);
110 +    DeclareParameter(PrintHeatFlux, bool);
111      DeclareParameter(TaggedAtomPair, intPair);
112      DeclareParameter(PrintTaggedPairDistance, bool);
113      DeclareParameter(ElectrostaticSummationMethod, std::string);
# Line 144 | Line 145 | namespace OpenMD {
145      DeclareParameter(RNEMD_exchangeType, std::string);
146      DeclareParameter(RNEMD_objectSelection, std::string);
147      DeclareParameter(RNEMD_targetFlux, RealType);
148 +    DeclareParameter(RNEMD_targetJzKE, RealType);
149 +    DeclareParameter(RNEMD_targetJzpx, RealType);
150 +    DeclareParameter(RNEMD_targetJzpy, RealType);
151 +    DeclareParameter(RNEMD_targetJzpz, RealType);
152      DeclareParameter(RNEMD_binShift, bool);
153 <    DeclareParameter(RNEMD_outputDimensionalTemperature, bool);
153 >    DeclareParameter(RNEMD_outputTemperature, bool);
154 >    DeclareParameter(RNEMD_outputVx, bool);
155 >    DeclareParameter(RNEMD_outputVy, bool);
156 >    // James put this in.
157 >    DeclareParameter(RNEMD_outputDen, bool);
158 >    DeclareParameter(RNEMD_outputVz, bool);    
159 >    DeclareParameter(RNEMD_outputAh, bool);
160 >    DeclareParameter(RNEMD_outputXyzTemperature, bool);
161 >    DeclareParameter(RNEMD_outputRotTemperature, bool);
162      DeclareParameter(UseRestraints, bool);
163      DeclareParameter(Restraint_file, std::string);
164      DeclareParameter(HULL_Method, std::string);
165      DeclareParameter(Alpha, RealType);
166 +    DeclareParameter(FlucQPropagator, std::string);
167 +    DeclareParameter(FlucQFriction, RealType);    
168 +    DeclareParameter(FlucQTolerance, RealType);    
169 +    DeclareParameter(FlucQMaxIterations, int);    
170 +    DeclareParameter(FlucQTargetTemp, RealType);
171 +    DeclareParameter(FlucQtauThermostat, RealType);
172      DeclareAlterableParameter(MDfileVersion, int);
173 <    
173 >
174    public:
175      bool addComponent(Component* comp);
176      bool addZConsStamp(ZConsStamp* zcons);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines