[cig-commits] r14649 - in mc/3D/CitcomS/trunk: lib module

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-04-09 13:53:58 -0700 (Thu, 09 Apr 2009)
New Revision: 14649

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Fixed a bug in cgrad solver introduced in r13270.


Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2009-04-09 20:39:24 UTC (rev 14648)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2009-04-09 20:53:58 UTC (rev 14649)
@@ -327,9 +327,9 @@
       input_int("nodez",&(E->mesh.noz),"essential",m);
       input_int("nodey",&(E->mesh.noy),"essential",m);
 
-      E->mesh.mgunitx = E->mesh.nox - 1;
-      E->mesh.mgunity = E->mesh.noy - 1;
-      E->mesh.mgunitz = E->mesh.noz - 1;
+      E->mesh.mgunitx = (E->mesh.nox - 1) / E->parallel.nprocx;
+      E->mesh.mgunity = (E->mesh.noy - 1) / E->parallel.nprocy;
+      E->mesh.mgunitz = (E->mesh.noz - 1) / E->parallel.nprocz;
       E->mesh.levels = 1;
   }
   else {

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2009-04-09 20:39:24 UTC (rev 14648)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2009-04-09 20:53:58 UTC (rev 14649)
@@ -551,9 +551,9 @@
             fprintf(stderr, "!!! cgrad solver must have levels=1\n");
             abort();
         }
-        E->mesh.mgunitx = E->mesh.nox - 1;
-        E->mesh.mgunity = E->mesh.noy - 1;
-        E->mesh.mgunitz = E->mesh.noz - 1;
+        E->mesh.mgunitx = (E->mesh.nox - 1) / E->parallel.nprocx;
+        E->mesh.mgunity = (E->mesh.noy - 1) / E->parallel.nprocy;
+        E->mesh.mgunitz = (E->mesh.noz - 1) / E->parallel.nprocz;
     }
     else {
         double levmax;