change to lattice

fancompute · May 1, 2017 · 05c79ef · 05c79ef
1 parent d078a74
commit 05c79ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/System.cpp b/src/System.cpp
@@ -597,8 +597,6 @@ namespace SYSTEM{
   // Implementaion of the structure class
   /*==============================================*/
   Structure::Structure(){
-    period_[0] = 0;
-    period_[1] = 0;
   }
   /*==============================================*/
   // This is a thin wrapper for the usage of smart pointer
@@ -639,14 +637,12 @@ namespace SYSTEM{
     layerMap_.insert(LayerMap::value_type(size, layer));
   }
   /*==============================================*/
-  // function setting the periodicity of a layer
+  // function setting the lattice of a layer
   // @args:
-  // p1: periodicity in x direction
-  // p2: periodicity in y direction
+  // lattice: the lattice of the structure
   /*==============================================*/
-  void Structure::setPeriodicity(const double p1, const double p2){
-    period_[0] = p1;
-    period_[1] = p2;
+  void Structure::setLattice(const Lattice& lattice){
+    lattice_ = lattice;
   }
   /*==============================================*/
   // function deleting a layer in the structure by its name

diff --git a/src/System.h b/src/System.h
@@ -163,7 +163,7 @@ namespace SYSTEM{
 
     void addMaterial(const Ptr<Material>& material);
     void addLayer(const Ptr<Layer>& layer);
-    void setPeriodicity(const double p1, const double p2 = 0);
+    void setLattice(const Lattice& lattice);
     void deleteLayerByName(const string name);
     void deleteLayerByLayer(const Ptr<Layer>& layer);
     Ptr<Layer> getLayerByIndex(const int index);
@@ -180,7 +180,7 @@ namespace SYSTEM{
     void reorganizeLayers();
     LayerMap layerMap_;
     MaterialMap materialMap_;
-    double period_[2];
+    Lattice lattice_;
   };