Changeset 13101 for issm/branches/trunk-jpl-damage/src/modules/Exp2Kml/Exp2Kml.cpp

Timestamp:

08/20/12 17:39:30 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 13099 into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/modules/Exp2Kml/Exp2Kml.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage ¶

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/branches/trunk-jpl-damage/src/modules/Exp2Kml/Exp2Kml.cpp ¶

@@ -25 +25 @@
         /*checks on arguments on the matlab side: */
         if (nlhs > NLHS) {
-                Exp2KmlUsage(); _error2_("Exp2Kml usage error");
+                Exp2KmlUsage(); _error_("Exp2Kml usage error");
         }
         if (nrhs < NRHS) {
-                Exp2KmlUsage(); _error2_("Exp2Kml usage error");
+                Exp2KmlUsage(); _error_("Exp2Kml usage error");
         }
 
@@ -49 +49 @@
 
         /*some checks*/
-        if (sgn !=+1 && sgn !=-1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
-        if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
-        if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
+        if (sgn !=+1 && sgn !=-1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
+        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
+        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
 
         /* Run core computations: */

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4