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

[becker at geodynamics.org]

Author: becker
Date: 2007-11-11 12:37:22 -0800 (Sun, 11 Nov 2007)
New Revision: 8275

Modified:
   mc/3D/CitcomS/trunk/lib/Construct_arrays.c
   mc/3D/CitcomS/trunk/lib/Full_obsolete.c
   mc/3D/CitcomS/trunk/lib/Ggrd_handling.c
   mc/3D/CitcomS/trunk/lib/Material_properties.c
   mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Synching with the new release, none of those changes should be relevant. 



Modified: mc/3D/CitcomS/trunk/lib/Construct_arrays.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Construct_arrays.c	2007-11-10 05:05:10 UTC (rev 8274)
+++ mc/3D/CitcomS/trunk/lib/Construct_arrays.c	2007-11-11 20:37:22 UTC (rev 8275)
@@ -30,7 +30,9 @@
 #include "element_definitions.h"
 #include "global_defs.h"
 
+int layers_r(struct All_variables *,float );
 
+
 /*========================================================
   Function to make the IEN array for a mesh of given
   dimension. IEN is an externally defined structure array
@@ -767,23 +769,17 @@
      struct All_variables *E;
      float r;
 {
-  float rlith, r410, rlm;
-
   int llayers = 0;
   /* 
      the z-values, as read in, are non-dimensionalized depth
      convert to radii
 
   */
-  rlith = E->sphere.ro - E->viscosity.zlith; /* lithosphere */
-  r410  = E->sphere.ro - E->viscosity.z410;
-  rlm   = E->sphere.ro - E->viscosity.zlm;
-
-  if (r > rlith)		/* in lithospherre */
+  if (r      > (E->sphere.ro - E->viscosity.zlith))		/* in lithospherre */
     llayers = 1;
-  else if ((r > r410)&& (r  <= rlith)) /* in asthenosphere 100...410 km */
+  else if (r > (E->sphere.ro - E->viscosity.z410)) /* in asthenosphere 100...410 km */
     llayers = 2;
-  else if ((r > rlm) && (r <= r410)) /* in transition zone, 410 - 660 km */
+  else if (r > (E->sphere.ro - E->viscosity.zlm)) /* in transition zone, 410 - 660 km */
     llayers = 3;
   else				/* lower mantle */
     llayers = 4;

Modified: mc/3D/CitcomS/trunk/lib/Full_obsolete.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_obsolete.c	2007-11-10 05:05:10 UTC (rev 8274)
+++ mc/3D/CitcomS/trunk/lib/Full_obsolete.c	2007-11-11 20:37:22 UTC (rev 8275)
@@ -527,6 +527,7 @@
 
 
 
+
 void set_communication_sphereh(E)
  struct All_variables *E;
  {

Modified: mc/3D/CitcomS/trunk/lib/Ggrd_handling.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Ggrd_handling.c	2007-11-10 05:05:10 UTC (rev 8274)
+++ mc/3D/CitcomS/trunk/lib/Ggrd_handling.c	2007-11-11 20:37:22 UTC (rev 8275)
@@ -106,6 +106,8 @@
     number_of_tracers = E->trace.ntracers[j];
     for (kk=1;kk <= number_of_tracers;kk++) {
       rad = E->trace.basicq[j][2][kk]; /* tracer radius */
+
+
       if(layers_r(E,rad) <= E->trace.ggrd_layers){
 	/* 
 	   in top layers 
@@ -127,7 +129,7 @@
 	E->trace.extraq[j][0][kk]= indbl;
       }else{
 	/* below */
-	E->trace.extraq[j][0][kk]=0.0;
+	E->trace.extraq[j][0][kk] = 0.0;
       }
     }
   }
@@ -135,6 +137,8 @@
   /* free grd structure */
   ggrd_grdtrack_free_gstruc(ggrd_ict);
   report(E,"ggrd tracer init done");
+  if(E->parallel.me == 0)
+    fprintf(stderr,"ggrd tracer init OK\n");
 }
 
 void ggrd_full_temp_init(struct All_variables *E)

Modified: mc/3D/CitcomS/trunk/lib/Material_properties.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Material_properties.c	2007-11-10 05:05:10 UTC (rev 8274)
+++ mc/3D/CitcomS/trunk/lib/Material_properties.c	2007-11-11 20:37:22 UTC (rev 8275)
@@ -39,6 +39,7 @@
 static void read_refstate(struct All_variables *E);
 static void adams_williamson_eos(struct All_variables *E);
 
+int layers_r(struct All_variables *,float);
 
 void mat_prop_allocate(struct All_variables *E)
 {
@@ -94,13 +95,13 @@
     }
 
     if(E->parallel.me == 0) {
-        fprintf(stderr, "nz  radius   depth    rho\n");
+      fprintf(stderr, "   nz     radius      depth    rho              layer\n");
     }
     if(E->parallel.me < E->parallel.nprocz)
         for(i=1; i<=E->lmesh.noz; i++) {
-            fprintf(stderr, "%d %f %f %e\n",
+            fprintf(stderr, "%6d %11f %11f %11e %5i\n",
                     i+E->lmesh.nzs-1, E->sx[1][3][i], 1-E->sx[1][3][i],
-                    E->refstate.rho[i]);
+                    E->refstate.rho[i],layers_r(E,E->sx[1][3][i]));
         }
 
     return;

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2007-11-10 05:05:10 UTC (rev 8274)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2007-11-11 20:37:22 UTC (rev 8275)
@@ -39,6 +39,8 @@
 #include <stdlib.h>
 #include "mpi.h"
 
+
+
 #ifdef USE_GGRD
 #include "hc.h"
 #endif
@@ -803,4 +805,7 @@
 }
 #endif
 
+
+
+
 #endif