[cig-commits] r6691 - mc/3D/CitcomS/branches/compressible/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-04-25 17:45:09 -0700 (Wed, 25 Apr 2007)
New Revision: 6691

Modified:
   mc/3D/CitcomS/branches/compressible/lib/Lith_age.c
   mc/3D/CitcomS/branches/compressible/lib/lith_age.h
Log:
Clean up restart in lith_age

Modified: mc/3D/CitcomS/branches/compressible/lib/Lith_age.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Lith_age.c	2007-04-26 00:44:38 UTC (rev 6690)
+++ mc/3D/CitcomS/branches/compressible/lib/Lith_age.c	2007-04-26 00:45:09 UTC (rev 6691)
@@ -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>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
@@ -36,7 +36,7 @@
 #include "lith_age.h"
 
 float find_age_in_MY();
-void lith_age_restart_conform_tbc(struct All_variables *E);
+void lith_age_update_tbc(struct All_variables *E);
 
 
 void lith_age_input(struct All_variables *E)
@@ -104,7 +104,7 @@
 }
 
 
-void lith_age_restart_tic(struct All_variables *E)
+void lith_age_construct_tic(struct All_variables *E)
 {
   int i, j, k, m, node, nodeg;
   int nox, noy, noz, gnox, gnoy, gnoz;
@@ -134,15 +134,16 @@
 	    }
 	}
 
-  /* modify temperature BC to be concorded with restarted T */
-  lith_age_restart_conform_tbc(E);
+  /* modify temperature BC to be concorded with read in T */
+  lith_age_update_tbc(E);
+
   temperatures_conform_bcs(E);
 
   return;
 }
 
 
-void lith_age_restart_conform_tbc(struct All_variables *E)
+void lith_age_update_tbc(struct All_variables *E)
 {
   int i, j, k, m, node;
   int nox, noy, noz;
@@ -173,14 +174,6 @@
 }
 
 
-
-void lith_age_construct_tic(struct All_variables *E)
-{
-  lith_age_restart_tic(E);
-  return;
-}
-
-
 void lith_age_temperature_bound_adj(struct All_variables *E, int lv)
 {
   int j,node,nno;

Modified: mc/3D/CitcomS/branches/compressible/lib/lith_age.h
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/lith_age.h	2007-04-26 00:44:38 UTC (rev 6690)
+++ mc/3D/CitcomS/branches/compressible/lib/lith_age.h	2007-04-26 00:45:09 UTC (rev 6691)
@@ -1,6 +1,6 @@
 /*
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  *<LicenseText>
  *
  * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,12 +22,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *</LicenseText>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 void lith_age_input(struct All_variables *E);
 void lith_age_init(struct All_variables *E);
-void lith_age_restart_tic(struct All_variables *E);
 void lith_age_construct_tic(struct All_variables *E) ;
 void lith_age_temperature_bound_adj(struct All_variables *E, int lv);
 void lith_age_conform_tbc(struct All_variables *E);