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

[becker at geodynamics.org]

Author: becker
Date: 2010-01-29 06:48:36 -0800 (Fri, 29 Jan 2010)
New Revision: 16194

Modified:
   mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
   mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h
Log:
Added old CitcomS element -> nodes -> element viscosity smoothing with new
use_ne_visc_smooth parameter, default is off. 



Modified: mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2010-01-29 05:09:05 UTC (rev 16193)
+++ mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2010-01-29 14:48:36 UTC (rev 16194)
@@ -146,6 +146,8 @@
     input_float("lv_channel_thickness",&(E->viscosity.lv_channel_thickness),"0.0047",m);
     input_float("lv_reduction",&(E->viscosity.lv_reduction),"0.5",m);
 
+    input_boolean("use_ne_visc_smooth",&(E->viscosity.use_ne_visc_smooth),"off",m);
+
     input_boolean("VMAX",&(E->viscosity.MAX),"off",m);
     if (E->viscosity.MAX)
         input_float("visc_max",&(E->viscosity.max_value),"1e22,1,nomax",m);
@@ -228,9 +230,9 @@
 
     void apply_viscosity_smoother();
     void visc_from_gint_to_nodes();
+    void  visc_from_nodes_to_gint();
 
 
-
     int i,j,m;
     float temp1,temp2,*vvvis;
     double *TG;
@@ -292,7 +294,10 @@
 
     /* interpolate from gauss quadrature points to node points for output */
     visc_from_gint_to_nodes(E,evisc,visc,E->mesh.levmax);
-
+    if(E->viscosity.use_ne_visc_smooth){ /* go the other way, for
+					    smoothing */
+      visc_from_nodes_to_gint(E,visc,evisc,E->mesh.levmax);
+    }
     return;
 }
 

Modified: mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h	2010-01-29 05:09:05 UTC (rev 16193)
+++ mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h	2010-01-29 14:48:36 UTC (rev 16194)
@@ -51,6 +51,7 @@
     float zlith;
     float zbase_layer[CITCOM_MAX_VISC_LAYER]; /* new */
 
+    int use_ne_visc_smooth;
 
     /* low viscosity channel and wedge stuff */
     int channel;