Migration wasn't enabled. Debugging in progress.

Author: highperformancecoder

models/ecolab_model.cc

@@ -633,7 +633,7 @@ void SpatialModel::generate(unsigned niter)
   tstep+=niter;
 }
 
-void SpatialModel::migrate()
+unsigned SpatialModel::migrate()
 {
   /* each cell gets a distinct random salt value */
   hostForAll([=,this](EcolabCell& c) {c.salt=c.rand();});
@@ -665,36 +665,47 @@ void SpatialModel::migrate()
   });
 
   array<int> ssum(species.size(),0);
+  size_t totalMigration=0;
   hostForAll([&,this](EcolabCell& c) {
-    // adjust delta so that density remains +ve
-    array<int> adjust=delta[c.idx()]+c.density;
-    adjust*=-(adjust<0);
-    if (sum(adjust)>0)
-      {
-        // distribute adjust among neighbours
-        array<int> totalDiff(c.density.size(),0);
-        for (auto& n: c)
-          {
-            auto& nbr=*n->as<EcolabCell>();
-            totalDiff+=nbr.density-c.density;
-          }
-        // adjust adjust to be divisible by totalDiff
-        adjust-=adjust%totalDiff;
-        for (auto& n: c)
-          {
-            auto& nbr=*n->as<EcolabCell>();
-            delta[nbr.idx()]+=((nbr.density-c.density)/totalDiff)*adjust;
-          }
-        delta[c.idx()]-=adjust;        
-      }
-    c.density+=delta[c.idx()];
+//    // adjust delta so that density remains +ve
+//    array<int> adjust=delta[c.idx()]+c.density;
+//    adjust*=-(adjust<0);
+//    if (sum(adjust)>0)
+//      {
+//        // distribute adjust among neighbours
+//        array<int> totalDiff(c.density.size(),0);
+//        for (auto& n: c)
+//          {
+//            auto& nbr=*n->as<EcolabCell>();
+//            totalDiff+=nbr.density-c.density;
+//          }
+//        // adjust adjust to be divisible by totalDiff
+//        adjust-=adjust%totalDiff;
+//        for (auto& n: c)
+//          {
+//            auto& nbr=*n->as<EcolabCell>();
+//            delta[nbr.idx()]+=((nbr.density-c.density)/totalDiff)*adjust;
+//          }
+//        delta[c.idx()]-=adjust;        
+//      }
+
+    //c.density+=delta[c.idx()];
+    cout<<delta[c.idx()]<<endl;
+    totalMigration+=sum(abs(delta[c.idx()]));
 #if !defined(NDEBUG)
 #pragma omp critical
     ssum+=delta[c.idx()];
 #endif
     });
   last_mig_tstep=tstep;
 
+#ifdef MPI_SUPPORT
+  if (myid()==0)
+    MPI_Reduce(MPI_IN_PLACE, &totalMigration,1,MPI_UNSIGNED,MPI_SUM,0,MPI_COMM_WORLD);
+  else
+    MPI_Reduce(&totalMigration,nullptr,1,MPI_UNSIGNED,MPI_SUM,0,MPI_COMM_WORLD);
+#endif
+  
   /* assertion testing that population numbers are conserved */
 #if !defined(NDEBUG) && !defined(SYCL_LANGUAGE_VERSION)
 #ifdef MPI_SUPPORT
@@ -723,6 +734,7 @@ void SpatialModel::migrate()
     }
   if (myid()==0) assert(sum(ssum==0)==int(ssum.size()));
 #endif
+  return totalMigration;
 }
 
 void ModelData::makeConsistent(size_t nsp)

models/ecolab_model.h

@@ -131,6 +131,6 @@ class SpatialModel: public ModelData, public EcolabGraph<EcolabCell>,
   /// returns number of extinctions
   unsigned condense();
   void mutate();
-  void migrate();
+  unsigned migrate();
 };
 

models/spatial_ecolab.py

@@ -47,7 +47,7 @@ def randomList(num, min, max):
 ecolab.interaction.val(randomList(len(ecolab.interaction.val), ecolab.odiag_min(), ecolab.odiag_max()))
 
 ecolab.mutation(nsp*[ecolab.mut_max()])
-ecolab.migration(nsp*[1e-1])
+ecolab.migration(nsp*[1e-20])
 
 from plot import plot
 from GUI import gui, statusBar, windows
@@ -56,6 +56,7 @@ def randomList(num, min, max):
 mut_factor=1000
 
 extinctions=0
+migrations=0
 def stepImpl():
     #ecolab.setDensitiesDevice()
     ecolab.generate(100)
@@ -67,8 +68,8 @@ def stepImpl():
     if (epochTs==epoch//2):
         ecolab.migration([x/mut_factor for x in ecolab.migration()])
 
-    #ecolab.migrate()
-    global extinctions
+    global extinctions, migrations
+    migrations+=ecolab.migrate()
     extinctions+=ecolab.condense()
     #ecolab.syncThreads()
     #print(ecolab.nsp()())
@@ -86,15 +87,18 @@ def stepImpl():
 def step():
     global extinctions
     extinctions=0
+    migrations=0
     for i in range(epoch//10000):
         stepImpl()
     if myid()==0:
+        print(migrations)
         nsp=len(ecolab.species)
         statusBar.configure(text=f't={ecolab.tstep()} nsp:{nsp}')
         plot('No. species',ecolab.tstep(),nsp,200*(ecolab.tstep()%epoch<0.5*epoch))
         #plot('No. species',ecolab.tstep(),nsp)
         plot('No. species by cell',ecolab.tstep(),ecolab.nsp()())
         plot('Extinctions',ecolab.tstep(),extinctions)
+        plot('Migration',ecolab.tstep(),migrations)
 #        for i in range(numX):
 #            for j in range(numY):
 #                plot(f'Density({i},{j})',ecolab.tstep(),ecolab.cell(i,j).density(), pens=ecolab.species())