ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-4/src/types/DirectionalAtomType.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-4/src/types/DirectionalAtomType.cpp (file contents):
Revision 1832 by tim, Wed Dec 1 17:38:32 2004 UTC vs.
Revision 1833 by tim, Thu Dec 2 16:53:56 2004 UTC

# Line 22 | Line 22
22   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
23   *
24   */
25 #include "types/DirectionalAtomType.hpp"
25  
26 + #include "types/DirectionalAtomType.hpp"
27 + #include "UseTheForce/DarkSide/dipole_interface.h"
28 + #include "UseTheForce/DarkSide/sticky_interface.h"
29 + #include "utils/simError.h"
30   namespace oopse {
31  
32   void DirectionalAtomType::complete() {
# Line 76 | Line 79 | void DirectionalAtomType::complete() {
79              if (vector3dData != NULL) {
80                  Vector3d diagElem= vector3dData->getData();
81                  Mat3x3d Q;
82 <                Q[0][0] = diagElem[0];
83 <                Q[1][1] = diagElem[1];
84 <                Q[2][2] = diagElem[2];
82 >                Q(0, 0) = diagElem[0];
83 >                Q(1, 1) = diagElem[1];
84 >                Q(2, 2) = diagElem[2];
85  
86                  //newQuadrupoleType(&atp.ident, Q->getArrayPointer, &isError);
87                  if (isError != 0) {
# Line 113 | Line 116 | void DirectionalAtomType::complete() {
116  
117              if (stickyData != NULL) {
118                  StickyParam stickyParam = stickyData->getData();
116                
117                makeStickyType(&atp.ident, &stickyParam.w0, &stickyParam.v0, &stickyParam.v0p, &stickyParam.rl,
118                    &stickyParam.ru, &stickyParam.rlp, &stickyParam.rup);
119  
120 +                /**@todo change fortran interface */
121 +                //makeStickyType(&atp.ident, &stickyParam.w0, &stickyParam.v0, &stickyParam.v0p, &stickyParam.rl,
122 +                //    &stickyParam.ru, &stickyParam.rlp, &stickyParam.rup);
123 +
124                  if (isError != 0) {
125                      sprintf( painCave.errMsg,
126                             "Fortran rejected newLJtype\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines