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

[becker at geodynamics.org]

Author: becker
Date: 2007-08-20 12:44:28 -0700 (Mon, 20 Aug 2007)
New Revision: 7849

Modified:
   mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
Log:
Forgot this file.



Modified: mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2007-08-20 18:11:08 UTC (rev 7848)
+++ mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2007-08-20 19:44:28 UTC (rev 7849)
@@ -649,23 +649,22 @@
 {
   float comp,comp_fac,CC[9],tcomp;
   double vmean,cc_loc;
-  int m,l,z,j,jj,kk,i;
+  int m,l,z,jj,kk,i;
 
   const int vpts = vpoints[E->mesh.nsd];
   const int nel = E->lmesh.nel;
   const int ends = enodes[E->mesh.nsd];
   if(E->trace.nflavors != 2)
     myerror(E,"sorry, CDEPV only supports two flavors");
-
+  if(E->composition.ncomp != 1)
+    myerror(E,"CDEPV only supports one composition yet");
+  
   for(m=1;m <= E->sphere.caps_per_proc;m++)  {
-
-    /* XXX: change cdepv_ff to be a vector of ncomp elements */
-    for(j=0;j<E->composition.ncomp;j++) {
     for(i = 1; i <= nel; i++){
       /* determine composition of each of the nodes of the
 	 element */
       for(kk = 1; kk <= ends; kk++){
-	CC[kk] = E->composition.comp_node[m][j][E->ien[m][i].node[kk]];
+	CC[kk] = E->composition.comp_node[m][0][E->ien[m][i].node[kk]];
 	if(CC[kk] < 0)CC[kk]=0.0;
 	if(CC[kk] > 1)CC[kk]=1.0;
       }
@@ -674,7 +673,7 @@
 	cc_loc = 0.0;
 	for(kk = 1; kk <= ends; kk++)
 	  cc_loc += CC[kk] * E->N.vpt[GNVINDEX(kk, jj)];
-
+	
 	/* geometric mean of viscosity */
 	vmean = exp(cc_loc  * E->viscosity.cdepv_ff[1] +
 		    (1.0-cc_loc) * E->viscosity.cdepv_ff[0]);
@@ -682,7 +681,6 @@
 	EEta[m][ (i-1)*vpts + jj ] *= vmean;
       } /* end jj loop */
     } /* end el loop */
-    } /* end ncomp loop */
   } /* end cap */
 }