Merge branch 'master' of https://github.com/tkoskela/vlasiator

mabelsfatalfable · Dec 3, 2018 · 6866770 · 6866770
2 parents af12394 + f23c059
commit 6866770
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 48 deletions.
diff --git a/MAKE/Makefile.sisu_gcc b/MAKE/Makefile.sisu_gcc
@@ -82,7 +82,7 @@ INC_PROFILE = -I$(LIBRARY_PREFIX)/mpich2/$(MPT_VERSION)/$(CC_BRAND)/$(CC_BRAND_V
 #header libraries
 
 INC_EIGEN = -I$(LIBRARY_PREFIX)/eigen/
-#INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg/
+INC_DCCRG = -I$(LIBRARY_PREFIX)/dccrg_new_neighbours/
 INC_VECTORCLASS = -I$(LIBRARY_PREFIX)/vectorclass
 #INC_FSGRID = -I$(LIBRARY_PREFIX)/fsgrid
 INC_FSGRID = -I/homeappl/home/koskelat/lib/fsgrid/

diff --git a/grid.cpp b/grid.cpp
@@ -115,7 +115,7 @@ void initializeGrid(
    mpiGrid.set_initial_length(grid_length)
       .set_load_balancing_method(&P::loadBalanceAlgorithm[0])
       .set_neighborhood_length(neighborhood_size)
-      .set_maximum_refinement_level(P::amrMaxSpatialRefLevel)
+      .set_maximum_refinement_level(0)
       .set_periodic(sysBoundaries.isBoundaryPeriodic(0),
                     sysBoundaries.isBoundaryPeriodic(1),
                     sysBoundaries.isBoundaryPeriodic(2))

diff --git a/spatial_cell.cpp b/spatial_cell.cpp
@@ -71,35 +71,35 @@ namespace spatial_cell {
       }
    }
 
-   SpatialCell::SpatialCell(const SpatialCell& other):
-     sysBoundaryFlag(other.sysBoundaryFlag),
-     sysBoundaryLayer(other.sysBoundaryLayer),
-     sysBoundaryLayerNew(other.sysBoundaryLayerNew),
-     velocity_block_with_content_list(other.velocity_block_with_content_list),
-     velocity_block_with_no_content_list(other.velocity_block_with_no_content_list),
-     initialized(other.initialized),
-     mpiTransferEnabled(other.mpiTransferEnabled),
-     populations(other.populations),
-     parameters(other.parameters),
-     derivatives(other.derivatives),
-     derivativesBVOL(other.derivativesBVOL),
-     null_block_data(std::array<Realf,WID3> {}) {
-
-        // //copy parameters
-        // for(unsigned int i=0;i< CellParams::N_SPATIAL_CELL_PARAMS;i++){
-        //    parameters[i]=other.parameters[i];
-        // }
-        // //copy derivatives
-        // for(unsigned int i=0;i< fieldsolver::N_SPATIAL_CELL_DERIVATIVES;i++){
-        //    derivatives[i]=other.derivatives[i];
-        // }
-        // //copy BVOL derivatives
-        // for(unsigned int i=0;i< bvolderivatives::N_BVOL_DERIVATIVES;i++){
-        //    derivativesBVOL[i]=other.derivativesBVOL[i];
-        // }        
-        // //set null block data
-        // for (unsigned int i=0; i<WID3; ++i) null_block_data[i] = 0.0;
-   }
+   // SpatialCell::SpatialCell(const SpatialCell& other):
+   //   sysBoundaryFlag(other.sysBoundaryFlag),
+   //   sysBoundaryLayer(other.sysBoundaryLayer),
+   //   sysBoundaryLayerNew(other.sysBoundaryLayerNew),
+   //   velocity_block_with_content_list(other.velocity_block_with_content_list),
+   //   velocity_block_with_no_content_list(other.velocity_block_with_no_content_list),
+   //   initialized(other.initialized),
+   //   mpiTransferEnabled(other.mpiTransferEnabled),
+   //   populations(other.populations),
+   //   parameters(other.parameters),
+   //   derivatives(other.derivatives),
+   //   derivativesBVOL(other.derivativesBVOL),
+   //   null_block_data(std::array<Realf,WID3> {}) {
+
+   //      // //copy parameters
+   //      // for(unsigned int i=0;i< CellParams::N_SPATIAL_CELL_PARAMS;i++){
+   //      //    parameters[i]=other.parameters[i];
+   //      // }
+   //      // //copy derivatives
+   //      // for(unsigned int i=0;i< fieldsolver::N_SPATIAL_CELL_DERIVATIVES;i++){
+   //      //    derivatives[i]=other.derivatives[i];
+   //      // }
+   //      // //copy BVOL derivatives
+   //      // for(unsigned int i=0;i< bvolderivatives::N_BVOL_DERIVATIVES;i++){
+   //      //    derivativesBVOL[i]=other.derivativesBVOL[i];
+   //      // }        
+   //      // //set null block data
+   //      // for (unsigned int i=0; i<WID3; ++i) null_block_data[i] = 0.0;
+   // }
 
 
    /** Adds "important" and removes "unimportant" velocity blocks

diff --git a/spatial_cell.hpp b/spatial_cell.hpp
@@ -1895,23 +1895,9 @@ namespace spatial_cell {
       return populations[popID].vmesh.hasGrandParent(blockGID);
    }
 
-   inline SpatialCell& SpatialCell::operator=(const SpatialCell& other) {
-
-      this->sysBoundaryFlag = other.sysBoundaryFlag;
-      this->sysBoundaryLayer = other.sysBoundaryLayer;
-      this->sysBoundaryLayerNew = other.sysBoundaryLayerNew;
-      this->velocity_block_with_content_list = other.velocity_block_with_content_list;
-      this->velocity_block_with_no_content_list = other.velocity_block_with_no_content_list;
-      this->initialized = other.initialized;
-      this->mpiTransferEnabled = other.mpiTransferEnabled;      
-      this->parameters = other.parameters;
-      this->derivatives = other.derivatives;
-      this->derivativesBVOL = other.derivativesBVOL;      
-      this->null_block_data = other.null_block_data;
-      this->populations = other.populations;
-
-      return *this;
-   }
+   // inline SpatialCell& SpatialCell::operator=(const SpatialCell&) { 
+   //    return *this;
+   // }
 
 } // namespaces