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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-01-16 12:37:14 -0800 (Tue, 16 Jan 2007)
New Revision: 5796

Modified:
   mc/3D/CitcomS/trunk/lib/Full_read_input_from_files.c
   mc/3D/CitcomS/trunk/lib/Regional_read_input_from_files.c
Log:
Fixed issue77 - velocity b.c not scaled correctly when age becomes negative

Modified: mc/3D/CitcomS/trunk/lib/Full_read_input_from_files.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_read_input_from_files.c	2007-01-16 19:49:51 UTC (rev 5795)
+++ mc/3D/CitcomS/trunk/lib/Full_read_input_from_files.c	2007-01-16 20:37:14 UTC (rev 5796)
@@ -1,6 +1,6 @@
 /*
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  *<LicenseText>
  *
  * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *</LicenseText>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 #include <math.h>
@@ -166,8 +166,8 @@
 		E->sphere.cap[m].VB[3][nodel] = 0.0;
 	      }
 	      else { /* negative ages - don't do the interpolation */
-		E->sphere.cap[m].VB[1][nodel] = VB1[1][nodeg];
-		E->sphere.cap[m].VB[2][nodel] = VB1[2][nodeg];
+		E->sphere.cap[m].VB[1][nodel] = VB1[1][nodeg] * E->data.scalev;
+		E->sphere.cap[m].VB[2][nodel] = VB1[2][nodeg] * E->data.scalev;
 		E->sphere.cap[m].VB[3][nodel] = 0.0;
 	      }
 	    }

Modified: mc/3D/CitcomS/trunk/lib/Regional_read_input_from_files.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_read_input_from_files.c	2007-01-16 19:49:51 UTC (rev 5795)
+++ mc/3D/CitcomS/trunk/lib/Regional_read_input_from_files.c	2007-01-16 20:37:14 UTC (rev 5796)
@@ -1,6 +1,6 @@
 /*
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  *<LicenseText>
  *
  * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *</LicenseText>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 #include <math.h>
@@ -136,8 +136,8 @@
                     E->sphere.cap[1].VB[3][nodel] = 0.0;
 		}
 		else { /* negative ages - don't do the interpolation */
-                    E->sphere.cap[1].VB[1][nodel] = VB1[1][nodeg];
-                    E->sphere.cap[1].VB[2][nodel] = VB1[2][nodeg];
+                    E->sphere.cap[1].VB[1][nodel] = VB1[1][nodeg]*E->data.scalev;
+                    E->sphere.cap[1].VB[2][nodel] = VB1[2][nodeg]*E->data.scalev;
                     E->sphere.cap[1].VB[3][nodel] = 0.0;
 		}
              }