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

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-02-28 12:40:59 -0800 (Thu, 28 Feb 2008)
New Revision: 11287

Modified:
   mc/3D/CitcomS/branches/v3.0/
   mc/3D/CitcomS/branches/v3.0/lib/Output_h5.c
Log:
Fixing Issue131: Compilation error in CitcomS-3.0.1 HDF5 support

Merged revisions 8893 via svnmerge from 
svn+ssh://svn@geodynamics.org/cig/mc/3D/CitcomS/trunk

........
  r8893 | tan2 | 2007-12-17 14:06:06 -0800 (Mon, 17 Dec 2007) | 1 line
  
  Fixed phase change width
........



Property changes on: mc/3D/CitcomS/branches/v3.0
___________________________________________________________________
Name: svnmerge-integrated
   - /mc/3D/CitcomS/trunk:1-8274,8276-8280
   + /mc/3D/CitcomS/trunk:1-8274,8276-8280,8893

Modified: mc/3D/CitcomS/branches/v3.0/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/branches/v3.0/lib/Output_h5.c	2008-02-28 06:34:55 UTC (rev 11286)
+++ mc/3D/CitcomS/branches/v3.0/lib/Output_h5.c	2008-02-28 20:40:59 UTC (rev 11287)
@@ -1440,17 +1440,26 @@
     status = set_attribute_float(input, "Ra_410", E->control.Ra_410);
     status = set_attribute_float(input, "clapeyron410", E->control.clapeyron410);
     status = set_attribute_float(input, "transT410", E->control.transT410);
-    status = set_attribute_float(input, "width410", E->control.width410);
+    status = set_attribute_float(input, "width410",
+                                 (E->control.inv_width410 == 0)?
+                                 E->control.inv_width410 :
+				 1.0/E->control.inv_width410);
 
     status = set_attribute_float(input, "Ra_670", E->control.Ra_670);
     status = set_attribute_float(input, "clapeyron670", E->control.clapeyron670);
     status = set_attribute_float(input, "transT670", E->control.transT670);
-    status = set_attribute_float(input, "width670", E->control.width670);
+    status = set_attribute_float(input, "width670",
+                                 (E->control.inv_width670 == 0)?
+                                 E->control.inv_width670 :
+				 1.0/E->control.inv_width670);
 
     status = set_attribute_float(input, "Ra_cmb", E->control.Ra_cmb);
     status = set_attribute_float(input, "clapeyroncmb", E->control.clapeyroncmb);
     status = set_attribute_float(input, "transTcmb", E->control.transTcmb);
-    status = set_attribute_float(input, "widthcmb", E->control.widthcmb);
+    status = set_attribute_float(input, "widthcmb",
+                                 (E->control.inv_widthcmb == 0)?
+                                 E->control.inv_widthcmb :
+				 1.0/E->control.inv_widthcmb);
 
     /*
      * Solver.inventory