[cig-commits] r11288 - in mc/3D/CitcomS/branches/v3.0: . lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-02-28 12:46:31 -0800 (Thu, 28 Feb 2008)
New Revision: 11288

Modified:
   mc/3D/CitcomS/branches/v3.0/
   mc/3D/CitcomS/branches/v3.0/lib/Initial_temperature.c
Log:
Merged revisions 9216 via svnmerge from 
svn+ssh://svn@geodynamics.org/cig/mc/3D/CitcomS/trunk

........
  r9216 | tan2 | 2008-02-04 12:40:45 -0800 (Mon, 04 Feb 2008) | 7 lines
  
  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()
........



Property changes on: mc/3D/CitcomS/branches/v3.0
___________________________________________________________________
Name: svnmerge-blocked
   - /mc/3D/CitcomS/trunk:8275
   + /mc/3D/CitcomS/trunk:8275,8960-8963,8973,8976,9020,9024,9058-9060,9062,9078-9079,9081,9086,9110,9112
Name: svnmerge-integrated
   - /mc/3D/CitcomS/trunk:1-8274,8276-8280,8893
   + /mc/3D/CitcomS/trunk:1-8274,8276-8280,8893,9216

Modified: mc/3D/CitcomS/branches/v3.0/lib/Initial_temperature.c
===================================================================
--- mc/3D/CitcomS/branches/v3.0/lib/Initial_temperature.c	2008-02-28 20:40:59 UTC (rev 11287)
+++ mc/3D/CitcomS/branches/v3.0/lib/Initial_temperature.c	2008-02-28 20:46:31 UTC (rev 11288)
@@ -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);