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

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-09-05 13:25:45 -0700 (Fri, 05 Sep 2008)
New Revision: 12820

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

........
  r12804 | tan2 | 2008-09-04 13:18:53 -0700 (Thu, 04 Sep 2008) | 2 lines
  
  Fixed issue 158: incorrect E->control.fi_max with coor=1
........



Property changes on: mc/3D/CitcomS/branches/v3.0
___________________________________________________________________
Name: svnmerge-blocked
   - /mc/3D/CitcomS/trunk:8275,8960-8963,8973,8976,9020,9024,9058-9060,9062,9078-9079,9081,9086,9110,9112,9222-9224,9268-9272,11177,11214-11218,11220-11222,11268,11279,12177
   + /mc/3D/CitcomS/trunk:8275,8960-8963,8973,8976,9020,9024,9058-9060,9062,9078-9079,9081,9086,9110,9112,9222-9224,9268-9272,11177,11214-11218,11220-11222,11268,11279,11328-11331,11757,11875,11878,11888-11889,11917,11957-11958,12177,12202,12204-12206,12208-12209,12257,12259,12270,12277,12293,12297-12298,12300-12303,12327-12328,12336,12343-12344,12347,12355-12356,12468,12472-12474,12799-12802,12813
Name: svnmerge-integrated
   - /mc/3D/CitcomS/trunk:1-8274,8276-8280,8893,9216,11219,11280,11332,12062-12176,12178-12201,12203,12207,12210-12256,12258,12260-12269,12271-12276,12278-12279
   + /mc/3D/CitcomS/trunk:1-8274,8276-8280,8893,9216,11219,11280,11332,12062-12176,12178-12201,12203,12207,12210-12256,12258,12260-12269,12271-12276,12278-12279,12804

Modified: mc/3D/CitcomS/branches/v3.0/lib/Regional_sphere_related.c
===================================================================
--- mc/3D/CitcomS/branches/v3.0/lib/Regional_sphere_related.c	2008-09-05 19:46:12 UTC (rev 12819)
+++ mc/3D/CitcomS/branches/v3.0/lib/Regional_sphere_related.c	2008-09-05 20:25:45 UTC (rev 12820)
@@ -102,7 +102,7 @@
       fscanf(fp,"%d %e",&nn,&fi1[E->mesh.gridmax][i]);
     }
     E->control.fi_min = fi1[E->mesh.gridmax][1];
-    E->control.fi_max = fi1[E->mesh.gridmax][gnox];
+    E->control.fi_max = fi1[E->mesh.gridmax][gnoy];
     
     fclose(fp);