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

[becker at geodynamics.org]

Author: becker
Date: 2012-01-24 13:54:19 -0800 (Tue, 24 Jan 2012)
New Revision: 19468

Modified:
   mc/3D/CitcomS/trunk/lib/Ggrd_handling.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Fixed minor ggrd assignment bug.



Modified: mc/3D/CitcomS/trunk/lib/Ggrd_handling.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Ggrd_handling.c	2012-01-24 19:38:17 UTC (rev 19467)
+++ mc/3D/CitcomS/trunk/lib/Ggrd_handling.c	2012-01-24 21:54:19 UTC (rev 19468)
@@ -1225,7 +1225,7 @@
       */
       /* scaled cutoff velocity */
       if(!E->control.ggrd_vtop_euler)		/* else, is not defined */
-	cutoff = E->control.ggrd.svt->fmaxlim[0] * vscale + 1e-5;
+	cutoff = E->control.ggrd.svp->fmaxlim[0] * vscale + 1e-5;
       else{
 	cutoff = 1e30;
       }

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2012-01-24 19:38:17 UTC (rev 19467)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2012-01-24 21:54:19 UTC (rev 19468)
@@ -601,9 +601,8 @@
 
   */
   input_boolean("ggrd_vtop_euler",&(E->control.ggrd_vtop_euler),"off",m);
-  if(E->control.ggrd_vtop_euler)
-    E->control.ggrd.vtop_control = 1;
 
+
   if(E->control.ggrd.vtop_control) /* this will override mat_control setting */
     E->control.vbcs_file = 1;
 

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2012-01-24 19:38:17 UTC (rev 19467)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2012-01-24 21:54:19 UTC (rev 19468)
@@ -531,7 +531,7 @@
   struct ggrd_master ggrd;
   float *surface_rayleigh;
   int ggrd_allow_mixed_vbcs,ggrd_comp_smooth,ggrd_tinit_nl_scale;
-  int ggrd_vtop_euler;;
+  int ggrd_vtop_euler;
   char ggrd_mat_depth_file[1000];
   ggrd_boolean ggrd_mat_is_3d;
   int ggrd_mat_limit_prefactor,ggrd_mat_is_code;