EHN: Heterogeneous Spatial Dom. Decomp. Algorithm (HeSpaDDA) part 1 r…

…ev 5 with Nikita's onSite comments
espressopp · Jan 18, 2018 · a56029e · a56029e
1 parent 5d44af8
commit a56029e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/examples/lattice_boltzmann/extForces/gravity_like.py b/examples/lattice_boltzmann/extForces/gravity_like.py
@@ -33,7 +33,7 @@
 system, integrator = espressopp.standard_system.Default(box=box)
 
 # calculate CPU nodeGrid based on the number of CPUs
-nodeGrid = espressopp.tools.decomp.nodeGridSimple(espressopp.MPI.COMM_WORLD.size)
+nodeGrid = espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size)
 
 # LATTICE BOLTZMANN (LB) INITIALIZATION
 # define an lb object and connect to the integrator

diff --git a/examples/lattice_boltzmann/extForces/sin_like_with_temp.py b/examples/lattice_boltzmann/extForces/sin_like_with_temp.py
@@ -33,7 +33,7 @@
 system, integrator = espressopp.standard_system.Default(box=box)
 
 # calculate CPU nodeGrid based on the number of CPUs
-nodeGrid = espressopp.tools.decomp.nodeGridSimple(espressopp.MPI.COMM_WORLD.size)
+nodeGrid = espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size)
 
 # LATTICE BOLTZMANN (LB) INITIALIZATION
 # define an lb object and connect to the integrator

diff --git a/examples/lattice_boltzmann/lb_md_coupling.py b/examples/lattice_boltzmann/lb_md_coupling.py
@@ -34,7 +34,7 @@
 integrator.dt  = 0.005
 
 # define a LB grid
-nodeGrid=espressopp.tools.decomp.nodeGridSimple(espressopp.MPI.COMM_WORLD.size)
+nodeGrid=espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size)
 lb = espressopp.integrator.LatticeBoltzmann(system, nodeGrid)
 integrator.addExtension(lb)
 

diff --git a/src/tools/decomp.py b/src/tools/decomp.py
@@ -16,9 +16,9 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-*****************************************************
-**decomp.py** - Domain Decomposition python functions
-*****************************************************
+***********************************************
+decomp - Domain Decomposition python functions
+***********************************************
 
 
 *  `nodeGrid(n,box_size,rc,skin,eh_size=0,ratioMS=0,idealGas=0,slabMSDims=[0,0,0])`:

diff --git a/src/tools/loadbal.py b/src/tools/loadbal.py
@@ -17,9 +17,9 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-*******************************************
-**loadbal.py** - Auxiliary python functions
-*******************************************
+**************************************************
+loadbal - HeSpaDDA load balancing python functions
+**************************************************
 
 
 *  `qbicity(box_size,rc,skin)`:

diff --git a/testsuite/lattice_boltzmann/test_LBMDcoupling.py b/testsuite/lattice_boltzmann/test_LBMDcoupling.py
@@ -65,7 +65,7 @@ def setUp(self):
 
         system.bc      = espressopp.bc.OrthorhombicBC(system.rng, box)
         system.skin    = skin
-        nodeGrid       = espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size,box,rc,skin)
+        nodeGrid       = espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size)
         cellGrid       = espressopp.tools.decomp.cellGrid(box, nodeGrid, rc, skin)
         system.storage = espressopp.storage.DomainDecomposition(system, nodeGrid, cellGrid)
 

diff --git a/testsuite/lattice_boltzmann/test_LatticeBoltzmann.py b/testsuite/lattice_boltzmann/test_LatticeBoltzmann.py
@@ -39,7 +39,7 @@ def setUp(self):
         # set up system
         global Ni, temperature
         system, integrator = espressopp.standard_system.LennardJones(0, box=(Ni, Ni, Ni), temperature=temperature)
-        nodeGrid = espressopp.tools.decomp.nodeGridSimple(espressopp.MPI.COMM_WORLD.size)
+        nodeGrid = espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size)
 
         # set up LB fluid
         lb = espressopp.integrator.LatticeBoltzmann(system, nodeGrid)

diff --git a/testsuite/lattice_boltzmann/test_extForce.py b/testsuite/lattice_boltzmann/test_extForce.py
@@ -38,7 +38,7 @@ def setUp(self):
         # set up system
         global Ni, temperature
         system, integrator = espressopp.standard_system.LennardJones(0, box=(Ni, Ni, Ni), temperature=temperature)
-        nodeGrid = espressopp.tools.decomp.nodeGridSimple(espressopp.MPI.COMM_WORLD.size)
+        nodeGrid = espressopp.tools.decomp.nodeGrid(espressopp.MPI.COMM_WORLD.size)
 
         # set up LB fluid
         lb = espressopp.integrator.LatticeBoltzmann(system, nodeGrid)