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

[becker at geodynamics.org]

Author: becker
Date: 2013-03-25 14:56:47 -0700 (Mon, 25 Mar 2013)
New Revision: 21631

Modified:
   mc/3D/CitcomS/trunk/lib/Full_boundary_conditions.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Output.c
   mc/3D/CitcomS/trunk/lib/Regional_boundary_conditions.c
Log:
Updating to newest version for testing purposes. 



Modified: mc/3D/CitcomS/trunk/lib/Full_boundary_conditions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_boundary_conditions.c	2013-03-25 21:17:11 UTC (rev 21630)
+++ mc/3D/CitcomS/trunk/lib/Full_boundary_conditions.c	2013-03-25 21:56:47 UTC (rev 21631)
@@ -67,7 +67,7 @@
 #ifdef USE_GGRD
 	/* Ggrd traction control */
 	if((lv==E->mesh.gridmax) && E->control.ggrd.vtop_control)
-	  ggrd_read_vtop_from_file(E, 1);
+	  ggrd_read_vtop_from_file(E, TRUE);
 #endif
 
       }
@@ -91,7 +91,7 @@
 #ifdef USE_GGRD
 	/* Ggrd velocity control */
 	if((lv==E->mesh.gridmax) && E->control.ggrd.vtop_control)
-	  ggrd_read_vtop_from_file(E,1);
+	  ggrd_read_vtop_from_file(E,TRUE);
 #endif
 
 

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2013-03-25 21:17:11 UTC (rev 21630)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2013-03-25 21:56:47 UTC (rev 21631)
@@ -442,9 +442,14 @@
   input_int("topvbc",&(E->mesh.topvbc),"0",m);
   input_int("botvbc",&(E->mesh.botvbc),"0",m);
 
-  input_int("toplayerbc",&(E->mesh.toplayerbc),"0",m); /* > 0: apply surface BC
+
+  /* 
+
+  internal boundary conditions
+
+  */
+  input_int("toplayerbc",&(E->mesh.toplayerbc),"0",m); /* > 0: apply surface boundary condition
                                                             throughout all nodes with r > toplayerbc_r
-
 							    < 0: apply to single node layer noz+toplayerbc
 
 						       */
@@ -452,6 +457,8 @@
 									     100 km depth */
 
 
+
+
   input_float("topvbxval",&(E->control.VBXtopval),"0.0",m);
   input_float("botvbxval",&(E->control.VBXbotval),"0.0",m);
   input_float("topvbyval",&(E->control.VBYtopval),"0.0",m);

Modified: mc/3D/CitcomS/trunk/lib/Output.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output.c	2013-03-25 21:17:11 UTC (rev 21630)
+++ mc/3D/CitcomS/trunk/lib/Output.c	2013-03-25 21:56:47 UTC (rev 21631)
@@ -85,7 +85,7 @@
 	 vtk_io = 3: write parallel legacy VTK file
 
       */
-      input_int("gzdir_vtkio",&(E->output.gzdir.vtk_io),"0",m);
+      input_int("gzdir_vtkio",&(E->output.gzdir.vtk_io),"1",m);
       /* remove net rotation on output step? */
       input_boolean("gzdir_rnr",&(E->output.gzdir.rnr),"off",m);
       E->output.gzdir.vtk_base_init = 0;

Modified: mc/3D/CitcomS/trunk/lib/Regional_boundary_conditions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_boundary_conditions.c	2013-03-25 21:17:11 UTC (rev 21630)
+++ mc/3D/CitcomS/trunk/lib/Regional_boundary_conditions.c	2013-03-25 21:56:47 UTC (rev 21631)
@@ -70,7 +70,7 @@
 #ifdef USE_GGRD
 	/* Ggrd traction control */
 	if((lv==E->mesh.gridmax) && E->control.ggrd.vtop_control)
-	  ggrd_read_vtop_from_file(E, 1);
+	  ggrd_read_vtop_from_file(E, TRUE);
 #endif
 
       }
@@ -84,7 +84,7 @@
 #ifdef USE_GGRD
 	/* Ggrd velocity control */
 	if((lv==E->mesh.gridmax) && E->control.ggrd.vtop_control)
-	  ggrd_read_vtop_from_file(E, 1);
+	  ggrd_read_vtop_from_file(E, TRUE);
 #endif
 	if(E->control.vbcs_file)   {
 	  if((lv == E->mesh.gridmin) && (j == E->sphere.caps_per_proc))
@@ -119,8 +119,10 @@
         horizontal_bc(E,E->sphere.cap[j].VB,1,3,0.0,SBZ,0,lv,j);
         horizontal_bc(E,E->sphere.cap[j].VB,1,2,0.0,SBY,0,lv,j);
         }
-      }    /* end for j and lv */
 
+
+    }    /* end for j and lv */
+
       velocity_refl_vert_bc(E);
 
       if(E->control.side_sbcs)