Changeset 8697

Timestamp:

06/23/11 09:48:35 (14 years ago)

Author:

jschierm

Message:

Modified validity checks in Xy2ll and Ll2xy modules for standard_parallel.

Location:

issm/trunk/src/mex

Files:

• Ll2xy/Ll2xy.cpp (modified) (1 diff)
• Xy2ll/Xy2ll.cpp (modified) (1 diff)

issm/trunk/src/mex/Ll2xy/Ll2xy.cpp

@@ -65 +65 @@
         else                ncoord=nlat;
         if (sgn != +1 && sgn != -1) _error_("Hemisphere sgn=%d must be +1 (north) or -1 (south).",sgn);
-        if (fabs(cm) > 180.+DBL_EPSILON) _error_("Central meridian cm=%g must be between -180 (west) and +180 (east) degrees.",cm);
-        if (fabs(sp) >  90.+DBL_EPSILON) _error_("Standard parallel sp=%g must be between -90 (south) and +90 (north) degrees.",sp);
+        if (fabs(cm)      > 180.) _error_("Central meridian cm=%g must be between -180 (west) and +180 (east) degrees.",cm);
+        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=%g must be between 0 and 90 degrees (in specified hemisphere).",sp);
 
         x=(double *)xmalloc(ncoord*sizeof(double));

issm/trunk/src/mex/Xy2ll/Xy2ll.cpp

@@ -65 +65 @@
         else            ncoord=nx;
         if (sgn != +1 && sgn != -1) _error_("Hemisphere sgn=%d must be +1 (north) or -1 (south).",sgn);
-        if (fabs(cm) > 180.+DBL_EPSILON) _error_("Central meridian cm=%g must be between -180 (west) and +180 (east) degrees.",cm);
-        if (fabs(sp) >  90.+DBL_EPSILON) _error_("Standard parallel sp=%g must be between -90 (south) and +90 (north) degrees.",sp);
+        if (fabs(cm)      > 180.) _error_("Central meridian cm=%g must be between -180 (west) and +180 (east) degrees.",cm);
+        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=%g must be between 0 and 90 degrees (in specified hemisphere).",sp);
 
         lat=(double *)xmalloc(ncoord*sizeof(double));