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

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-11-19 15:09:04 -0800 (Thu, 19 Nov 2009)
New Revision: 16013

Modified:
   mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
   mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h
Log:
refactor viscosity definition

Modified: mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2009-11-19 23:08:27 UTC (rev 16012)
+++ mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2009-11-19 23:09:04 UTC (rev 16013)
@@ -97,7 +97,7 @@
     input_boolean("PDEPV",&(E->viscosity.PDEPV),"off",m); /* plasticity addition by TWB */
     if (E->viscosity.PDEPV) {
       E->viscosity.pdepv_visited = 0;
-      for(i=0;i < CITCOM_MAX_VISC_LAYER;i++) {
+      for(i=0;i < E->viscosity.num_mat;i++) {
           E->viscosity.pdepv_a[i] = 1.e20; /* \sigma_y = min(a + b * (1-r),y) */
           E->viscosity.pdepv_b[i] = 0.0;
           E->viscosity.pdepv_y[i] = 1.e20;

Modified: mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h	2009-11-19 23:08:27 UTC (rev 16012)
+++ mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h	2009-11-19 23:09:04 UTC (rev 16013)
@@ -83,7 +83,8 @@
 
     /* "plasticity" law parameters */
     int PDEPV;
-    float *pdepv_a, *pdepv_b, *pdepv_y, pdepv_offset;
+    float *pdepv_a, *pdepv_b, *pdepv_y;
+    float pdepv_offset;
     int pdepv_eff, pdepv_visited;
     int psrw;