[cig-commits] commit: Remove a check for the height not being correct, because it can be reset by SurfaceAdaptor later

[Mercurial]

changeset:   587:607b253d0950
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Sat Feb 06 10:00:41 2010 -0800
files:       Mesh/src/CartesianGenerator.c
description:
Remove a check for the height not being correct, because it can be reset by SurfaceAdaptor later


diff -r 5b2e78ffb9c7 -r 607b253d0950 Mesh/src/CartesianGenerator.c
--- a/Mesh/src/CartesianGenerator.c	Thu Feb 04 15:20:30 2010 -0800
+++ b/Mesh/src/CartesianGenerator.c	Sat Feb 06 10:00:41 2010 -0800
@@ -303,10 +303,10 @@ void _CartesianGenerator_AssignFromXML( 
 			/* test to ensure provided domain is valid */
 			maxVal =  (abs(crdMax[d_i]) > abs(crdMin[d_i])) ? abs(crdMax[d_i]) : abs(crdMin[d_i]);
 			if( maxVal == 0  ) maxVal = 1;  /* if maxVal is zero, then both numbers must be zero, set to one as next test will fail */
-         Journal_Firewall( ( ( (crdMax[d_i] - crdMin[d_i])/maxVal) > 1E-10 ), errorStream,
+         Journal_Firewall( ( ( (crdMax[d_i] - crdMin[d_i])/maxVal) > 1E-10 || d_i==J_AXIS), errorStream,
                      "\n\nError in %s for %s '%s'\n\n"
-                     "Dimension of domain (min = %f, max = %f) for component number %u is not valid.\n\n", 
-                     __func__, self->type, self->name, 
+                     "Dimension of domain (min = %f, max = %f) for component number %u is not valid.\n\n",
+                     __func__, self->type, self->name,
                      crdMin[d_i], crdMax[d_i], d_i);
 		}