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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-01-17 12:02:37 -0800 (Wed, 17 Jan 2007)
New Revision: 5799

Modified:
   mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
Log:
Fixed a bug in locating elements right above tracers

Modified: mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2007-01-17 18:13:46 UTC (rev 5798)
+++ mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2007-01-17 20:02:37 UTC (rev 5799)
@@ -667,7 +667,11 @@
                     FI_LOCAL_ELEM_T = E->Tracer.FI_LOC_ELEM_T[n];
                     R_LOCAL_ELEM_T = E->Tracer.R_LOC_ELEM_T[n];
 
-                    if((R_LOCAL_ELEM >= R_LOCAL_ELEM_T) && (R_LOCAL_ELEM <= R_LOCAL_ELEM_T+E->viscosity.lv_channel_thickness)) {
+                    if((R_LOCAL_ELEM >= R_LOCAL_ELEM_T) &&
+                       (R_LOCAL_ELEM <= R_LOCAL_ELEM_T+E->viscosity.lv_channel_thickness) &&
+                       (FI_LOCAL_ELEM == FI_LOCAL_ELEM_T) &&
+                       (THETA_LOCAL_ELEM == THETA_LOCAL_ELEM_T)) {
+
                         F[i] = E->viscosity.lv_reduction;
 
                     }
@@ -700,7 +704,9 @@
                     R_LOCAL_ELEM_T = E->Tracer.R_LOC_ELEM_T[n];
 
 
-                    if(R_LOCAL_ELEM >= R_LOCAL_ELEM_T) {
+                    if((R_LOCAL_ELEM >= R_LOCAL_ELEM_T) &&
+                       (FI_LOCAL_ELEM == FI_LOCAL_ELEM_T) &&
+                       (THETA_LOCAL_ELEM == THETA_LOCAL_ELEM_T)) {
 
                         F[i] = E->viscosity.lv_reduction;
                     }