[cig-commits] r13208 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-10-31 13:18:13 -0700 (Fri, 31 Oct 2008)
New Revision: 13208

Modified:
   mc/3D/CitcomS/trunk/lib/Full_version_dependent.c
   mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c
Log:
Reporting correct nno and nel (number of nodes and elements)


Modified: mc/3D/CitcomS/trunk/lib/Full_version_dependent.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_version_dependent.c	2008-10-31 19:12:15 UTC (rev 13207)
+++ mc/3D/CitcomS/trunk/lib/Full_version_dependent.c	2008-10-31 20:18:13 UTC (rev 13208)
@@ -76,8 +76,8 @@
   E->mesh.ely = E->mesh.noy-1;
   E->mesh.elz = E->mesh.noz-1;
 
-  /* number of nodes, including overlaping nodes between processors */
-  E->mesh.nno = E->sphere.caps*E->mesh.nox*E->mesh.noy*E->mesh.noz;
+  /* number of nodes, excluding overlaping nodes between processors */
+  E->mesh.nno = E->sphere.caps*(E->mesh.nox-1)*(E->mesh.noy-1)*E->mesh.noz + 2*E->mesh.noz;
 
   E->mesh.nel = E->sphere.caps*E->mesh.elx*E->mesh.elz*E->mesh.ely;
 
@@ -127,8 +127,12 @@
   E->data.scalev = (E->data.radius_km*1e3/E->data.therm_diff)/(100*365.25*24*3600);
   E->data.timedir = E->control.Atemp / fabs(E->control.Atemp);
 
-  if(E->control.print_convergence && E->parallel.me==0)
-    fprintf(stderr,"Problem has %d x %d x %d nodes\n",E->mesh.nox,E->mesh.noz,E->mesh.noy);
+  if(E->control.print_convergence && E->parallel.me==0) {
+      fprintf(stderr,"Problem has %d x %d x %d nodes per cap, %d nodes and %d elements in total\n",
+              E->mesh.nox, E->mesh.noz, E->mesh.noy, E->mesh.nno, E->mesh.nel);
+      fprintf(E->fp,"Problem has %d x %d x %d nodes per cap, %d nodes and %d elements in total\n",
+              E->mesh.nox, E->mesh.noz, E->mesh.noy, E->mesh.nno, E->mesh.nel);
+  }
 
   return;
 }

Modified: mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c	2008-10-31 19:12:15 UTC (rev 13207)
+++ mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c	2008-10-31 20:18:13 UTC (rev 13208)
@@ -74,7 +74,7 @@
    E->mesh.ely = E->mesh.noy-1;
    E->mesh.elz = E->mesh.noz-1;
 
-  /* number of nodes, including overlaping nodes between processors */
+  /* number of nodes, excluding overlaping nodes between processors */
    E->mesh.nno = E->sphere.caps*E->mesh.nox*E->mesh.noy*E->mesh.noz;
 
    E->mesh.nel = E->sphere.caps*E->mesh.elx*E->mesh.elz*E->mesh.ely;
@@ -126,9 +126,12 @@
     E->data.timedir = E->control.Atemp / fabs(E->control.Atemp);
 
 
-    if(E->control.print_convergence && E->parallel.me==0)
-	fprintf(stderr,"Problem has %d x %d x %d nodes\n",E->mesh.nox,E->mesh.noz,E->mesh.noy);
-
+    if(E->control.print_convergence && E->parallel.me==0) {
+	fprintf(stderr,"Problem has %d x %d x %d nodes per cap, %d nodes and %d elements in total\n",
+                E->mesh.nox, E->mesh.noz, E->mesh.noy, E->mesh.nno, E->mesh.nel);
+	fprintf(E->fp,"Problem has %d x %d x %d nodes per cap, %d nodes and %d elements in total\n",
+                E->mesh.nox, E->mesh.noz, E->mesh.noy, E->mesh.nno, E->mesh.nel);
+    }
    return;
 }