Migration finally working, although caveat with updating salt value t…

…o be resolved.
highperformancecoder · Sep 12, 2024 · 39765f3 · 39765f3
1 parent bc3a653
commit 39765f3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/lib/GUI.py b/lib/GUI.py
@@ -3,6 +3,7 @@
 # list of windows to update each simulation step
 windows=[]
 runner=Tk()
+runner.title('EcoLab')
 statusBar=ttk.Label(runner,text='Not started')
 statusBar.pack()
 

diff --git a/models/ecolab_model.cc b/models/ecolab_model.cc
@@ -443,7 +443,14 @@ void SpatialModel::setGrid(size_t nx, size_t ny)
   numX=nx; numY=ny;
   for (size_t i=0; i<numX; ++i)
     for (size_t j=0; j<numY; ++j)
-      insertObject(makeId(i,j));
+      {
+        auto o=insertObject(makeId(i,j));
+        // wire up von Neumann neighborhood
+        o->neighbours.push_back(makeId(i-1,j));
+        o->neighbours.push_back(makeId(i+1,j)); 
+        o->neighbours.push_back(makeId(i,j-1)); 
+        o->neighbours.push_back(makeId(i,j+1)); 
+      }
   rebuildPtrLists();
 }
 
@@ -457,9 +464,12 @@ void SpatialModel::generate(unsigned niter)
 void SpatialModel::migrate()
 {
   /* each cell gets a distinct random salt value */
-  for (auto& i: *this)
-    (*this)[i]->as<EcolabCell>()->salt=array_urand.rand();
+  // TODO why doesn't this loop work?
+//  for (auto& i: *this)
+//    (*this)[i]->as<EcolabCell>()->salt=array_urand.rand();
 
+  for (auto& o: objects) o->salt=array_urand.rand();
+
   // prepareNeighbours
 
   vector<array<int> > delta(size(), array<int>(species.size(),0));

diff --git a/models/migration_test.py b/models/migration_test.py
@@ -15,11 +15,12 @@
 ecolab.partitionObjects()
 ecolab.cell(4,4).density(nsp*[100])
 
-ecolab.migration(nsp*[1e-5])
+ecolab.migration(nsp*[0.5])
 
 from plot import plot
 from GUI import gui, statusBar, windows
 
+ecolab.makeConsistent()
 def step():
     ecolab.migrate()
     ecolab.tstep(ecolab.tstep()+1)