ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed namespace issue

Browse Source
This commit is contained in:
David Nicholson
2017-09-28 17:43:59 -04:00
parent 80898b8695
commit c0f1a32661
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/USER-UEF/dump_cfg_uef.cpp
View File

@ -24,6 +24,7 @@
#include "compute.h" #include "compute.h"
#include "fix.h" #include "fix.h"
#include "error.h" #include "error.h"
#include "uef_utils.h"
#include "dump_cfg_uef.h" #include "dump_cfg_uef.h"
#include "fix_nh_uef.h" #include "fix_nh_uef.h"
@ -84,7 +85,7 @@ void DumpCFGUef::write_header(bigint n)
rot[i][j]=rot[j][i]; rot[i][j]=rot[j][i];
rot[j][i]=t; rot[j][i]=t;
} }
mul_m2(rot,box); UEF_utils::mul_m2(rot,box);
double scale = 1.0; double scale = 1.0;

5
src/USER-UEF/uef_utils.cpp
View File

@ -24,8 +24,7 @@
#include <math.h> #include <math.h>
#include "uef_utils.h" #include "uef_utils.h"
using namespace LAMMPS_NS; namespace LAMMPS_NS{ namespace UEF_utils{
using namespace UEF_utils;
UEFBox::UEFBox() UEFBox::UEFBox()
{ {
@ -362,4 +361,4 @@ void make_unique(double b[3][3], int r[3][3])
if (b[1][1] < 0){ neg_col(b,1); neg_col(r,1); } if (b[1][1] < 0){ neg_col(b,1); neg_col(r,1); }
if (det(b) < 0){ neg_col(b,2); neg_col(r,2); } if (det(b) < 0){ neg_col(b,2); neg_col(r,2); }
} }
}}

6
src/USER-UEF/uef_utils.h
View File

@ -23,9 +23,10 @@
http://link.springer.com/chapter/10.1007%2F3-540-44670-2_13 http://link.springer.com/chapter/10.1007%2F3-540-44670-2_13
*/ */
#ifndef UEF_UTILS_H
#define UEF_UTILS_H
namespace LAMMPS_NS { namespace LAMMPS_NS{ namespace UEF_utils{
namespace UEF_utils {
class UEFBox class UEFBox
{ {
@ -137,3 +138,4 @@ void mul_m2(const T m1[3][3], T m2[3][3])
} }
} }
#endif