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

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-02-04 12:40:45 -0800 (Mon, 04 Feb 2008)
New Revision: 9216

Modified:
   mc/3D/CitcomS/trunk/lib/Initial_temperature.c
Log:
Fixed a regression reported by Lydia Dicaprio.

The initial temperature should be constructured in this order:
1. if tic_method=-1, read from velo files.
2. if lith_age=1, read/constructed from lith_age files.
3. otherwise, call {full,regional}_construct_tic_from_input()


Modified: mc/3D/CitcomS/trunk/lib/Initial_temperature.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Initial_temperature.c	2008-02-03 22:37:14 UTC (rev 9215)
+++ mc/3D/CitcomS/trunk/lib/Initial_temperature.c	2008-02-04 20:40:45 UTC (rev 9216)
@@ -180,16 +180,13 @@
 
 
 
-/* This function is replaced by CitcomS.Components.IC.initTemperature()*/
 void convection_initial_temperature(struct All_variables *E)
 {
   void report();
 
   report(E,"Initialize temperature field");
 
-  if (E->control.lith_age)
-    lith_age_construct_tic(E);
-  else if (E->convection.tic_method == -1) {
+  if (E->convection.tic_method == -1) {
       /* read temperature from file */
 #ifdef USE_GZDIR
       if(strcmp(E->output.format, "ascii-gz") == 0)
@@ -198,6 +195,8 @@
 #endif
           read_tic_from_file(E);
   }
+  else if (E->control.lith_age)
+    lith_age_construct_tic(E);
   else
     (E->solver.construct_tic_from_input)(E);