Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
9111cca0
Commit
9111cca0
authored
Feb 20, 2015
by
peastman
Browse files
Moved reference platform classes into OpenMM namespace
parent
8148f51d
Changes
73
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
28 additions
and
29 deletions
+28
-29
platforms/reference/include/SimTKOpenMMCommon.h
platforms/reference/include/SimTKOpenMMCommon.h
+3
-8
platforms/reference/include/SimTKOpenMMLog.h
platforms/reference/include/SimTKOpenMMLog.h
+4
-0
platforms/reference/include/SimTKOpenMMUtilities.h
platforms/reference/include/SimTKOpenMMUtilities.h
+4
-2
platforms/reference/src/SimTKReference/ReferenceAndersenThermostat.cpp
...erence/src/SimTKReference/ReferenceAndersenThermostat.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceAngleBondIxn.cpp
...ms/reference/src/SimTKReference/ReferenceAngleBondIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceBondForce.cpp
...forms/reference/src/SimTKReference/ReferenceBondForce.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceBondIxn.cpp
platforms/reference/src/SimTKReference/ReferenceBondIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceBrownianDynamics.cpp
...eference/src/SimTKReference/ReferenceBrownianDynamics.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceCCMAAlgorithm.cpp
...s/reference/src/SimTKReference/ReferenceCCMAAlgorithm.cpp
+1
-3
platforms/reference/src/SimTKReference/ReferenceCMAPTorsionIxn.cpp
.../reference/src/SimTKReference/ReferenceCMAPTorsionIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceCustomCompoundBondIxn.cpp
...nce/src/SimTKReference/ReferenceCustomCompoundBondIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.cpp
...rms/reference/src/SimTKReference/ReferenceCustomGBIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceCustomHbondIxn.cpp
.../reference/src/SimTKReference/ReferenceCustomHbondIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceCustomNonbondedIxn.cpp
...erence/src/SimTKReference/ReferenceCustomNonbondedIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceDynamics.cpp
platforms/reference/src/SimTKReference/ReferenceDynamics.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceForce.cpp
platforms/reference/src/SimTKReference/ReferenceForce.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
...reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceLJCoulomb14.cpp
...rms/reference/src/SimTKReference/ReferenceLJCoulomb14.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp
...ms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp
+1
-1
platforms/reference/src/SimTKReference/ReferenceLincsAlgorithm.cpp
.../reference/src/SimTKReference/ReferenceLincsAlgorithm.cpp
+1
-1
No files found.
platforms/reference/include/SimTKOpenMMCommon.h
View file @
9111cca0
...
@@ -25,18 +25,11 @@
...
@@ -25,18 +25,11 @@
#ifndef __SimTKOpenMMCommon_H__
#ifndef __SimTKOpenMMCommon_H__
#define __SimTKOpenMMCommon_H__
#define __SimTKOpenMMCommon_H__
// include file containing entries commonly used
// STL includes
#include <vector>
#include <vector>
#include <string>
#include <string>
// ---------------------------------------------------------------------------------------
#include "RealVec.h"
#include "RealVec.h"
// ---------------------------------------------------------------------------------------
namespace
OpenMM
{
typedef
std
::
vector
<
RealOpenMM
>
RealOpenMMVector
;
typedef
std
::
vector
<
RealOpenMM
>
RealOpenMMVector
;
typedef
RealOpenMMVector
::
iterator
RealOpenMMVectorI
;
typedef
RealOpenMMVector
::
iterator
RealOpenMMVectorI
;
...
@@ -62,4 +55,6 @@ class SimTKOpenMMCommon {
...
@@ -62,4 +55,6 @@ class SimTKOpenMMCommon {
static
const
int
ErrorReturn
;
static
const
int
ErrorReturn
;
};
};
}
// namespace OpenMM
#endif // __SimTKOpenMMCommon_H__
#endif // __SimTKOpenMMCommon_H__
platforms/reference/include/SimTKOpenMMLog.h
View file @
9111cca0
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
#include "SimTKOpenMMCommon.h"
#include "SimTKOpenMMCommon.h"
#include "openmm/internal/windowsExport.h"
#include "openmm/internal/windowsExport.h"
namespace
OpenMM
{
/** ---------------------------------------------------------------------------------------
/** ---------------------------------------------------------------------------------------
SimTKOpenMMLog class used for logging
SimTKOpenMMLog class used for logging
...
@@ -182,4 +184,6 @@ class OPENMM_EXPORT SimTKOpenMMLog {
...
@@ -182,4 +184,6 @@ class OPENMM_EXPORT SimTKOpenMMLog {
};
};
}
// namespace OpenMM
#endif //__SimTKOpenMMLog_H__
#endif //__SimTKOpenMMLog_H__
platforms/reference/include/SimTKOpenMMUtilities.h
View file @
9111cca0
...
@@ -33,6 +33,8 @@
...
@@ -33,6 +33,8 @@
#include <string>
#include <string>
namespace
OpenMM
{
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
Class of static methods to be shared
Class of static methods to be shared
...
@@ -220,6 +222,6 @@ class OPENMM_EXPORT SimTKOpenMMUtilities {
...
@@ -220,6 +222,6 @@ class OPENMM_EXPORT SimTKOpenMMUtilities {
static
void
loadCheckpoint
(
std
::
istream
&
stream
);
static
void
loadCheckpoint
(
std
::
istream
&
stream
);
};
};
//
---------------------------------------------------------------------------------------
}
//
namespace OpenMM
#endif // __SimTKOpenMMUtilities_H__
#endif // __SimTKOpenMMUtilities_H__
platforms/reference/src/SimTKReference/ReferenceAndersenThermostat.cpp
View file @
9111cca0
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
#include "ReferenceAndersenThermostat.h"
#include "ReferenceAndersenThermostat.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceAngleBondIxn.cpp
View file @
9111cca0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include "ReferenceForce.h"
#include "ReferenceForce.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceBondForce.cpp
View file @
9111cca0
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
#include "ReferenceBondForce.h"
#include "ReferenceBondForce.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceBondIxn.cpp
View file @
9111cca0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include "ReferenceBondIxn.h"
#include "ReferenceBondIxn.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceBrownianDynamics.cpp
View file @
9111cca0
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#include <cstdio>
#include <cstdio>
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceCCMAAlgorithm.cpp
View file @
9111cca0
...
@@ -39,9 +39,7 @@ using std::map;
...
@@ -39,9 +39,7 @@ using std::map;
using
std
::
pair
;
using
std
::
pair
;
using
std
::
vector
;
using
std
::
vector
;
using
std
::
set
;
using
std
::
set
;
using
OpenMM
::
OpenMMException
;
using
namespace
OpenMM
;
using
OpenMM
::
Vec3
;
using
OpenMM
::
RealVec
;
ReferenceCCMAAlgorithm
::
ReferenceCCMAAlgorithm
(
int
numberOfAtoms
,
ReferenceCCMAAlgorithm
::
ReferenceCCMAAlgorithm
(
int
numberOfAtoms
,
int
numberOfConstraints
,
int
numberOfConstraints
,
...
...
platforms/reference/src/SimTKReference/ReferenceCMAPTorsionIxn.cpp
View file @
9111cca0
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#include "ReferenceForce.h"
#include "ReferenceForce.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceCustomCompoundBondIxn.cpp
View file @
9111cca0
...
@@ -37,7 +37,7 @@ using std::pair;
...
@@ -37,7 +37,7 @@ using std::pair;
using
std
::
string
;
using
std
::
string
;
using
std
::
stringstream
;
using
std
::
stringstream
;
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceCustomGBIxn.cpp
View file @
9111cca0
...
@@ -36,7 +36,7 @@ using std::set;
...
@@ -36,7 +36,7 @@ using std::set;
using
std
::
string
;
using
std
::
string
;
using
std
::
stringstream
;
using
std
::
stringstream
;
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceCustomHbondIxn.cpp
View file @
9111cca0
...
@@ -38,7 +38,7 @@ using std::set;
...
@@ -38,7 +38,7 @@ using std::set;
using
std
::
string
;
using
std
::
string
;
using
std
::
stringstream
;
using
std
::
stringstream
;
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceCustomNonbondedIxn.cpp
View file @
9111cca0
...
@@ -37,7 +37,7 @@ using std::string;
...
@@ -37,7 +37,7 @@ using std::string;
using
std
::
stringstream
;
using
std
::
stringstream
;
using
std
::
set
;
using
std
::
set
;
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceDynamics.cpp
View file @
9111cca0
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
#include <cstdio>
#include <cstdio>
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceForce.cpp
View file @
9111cca0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include <cstdio>
#include <cstdio>
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceHarmonicBondIxn.cpp
View file @
9111cca0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include "ReferenceForce.h"
#include "ReferenceForce.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceLJCoulomb14.cpp
View file @
9111cca0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include "ReferenceForce.h"
#include "ReferenceForce.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp
View file @
9111cca0
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
using
std
::
set
;
using
std
::
set
;
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
platforms/reference/src/SimTKReference/ReferenceLincsAlgorithm.cpp
View file @
9111cca0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include "openmm/OpenMMException.h"
#include "openmm/OpenMMException.h"
using
std
::
vector
;
using
std
::
vector
;
using
OpenMM
::
RealVec
;
using
namespace
OpenMM
;
/**---------------------------------------------------------------------------------------
/**---------------------------------------------------------------------------------------
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment