Changeset 12706 for issm/trunk/src/modules/Ll2xy/Ll2xy.cpp

Timestamp:

07/24/12 10:36:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

File:

• issm/trunk/src/modules/Ll2xy/Ll2xy.cpp (modified) (3 diffs)

issm/trunk/src/modules/Ll2xy/Ll2xy.cpp

@@ -25 +25 @@
         /*checks on arguments on the matlab side: */
         if (nlhs > NLHS) {
-                Ll2xyUsage(); _error_("Ll2xy usage error");
+                Ll2xyUsage(); _error2_("Ll2xy usage error");
         }
         if (nrhs < NRHS) {
-                Ll2xyUsage(); _error_("Ll2xy usage error");
+                Ll2xyUsage(); _error2_("Ll2xy usage error");
         }
 
@@ -40 +40 @@
         if(options->GetOption("central_meridian") || options->GetOption("standard_parallel")){
                 options->Get(&cm,"central_meridian");
-                if (verbose) printf("  cm=%g\n",cm);
+                if (verbose) _printLine_("  cm=" << cm);
                 options->Get(&sp,"standard_parallel");
-                if (verbose) printf("  sp=%g\n",sp);
+                if (verbose) _printLine_("  sp=" << sp);
         }
 
         /*some checks*/
-        if (verbose) printf("Checking inputs:\n");
-        if (nlat != nlon) _error_("Must have same number of lat[%d] and lon[%d] coordinates.",nlat,nlon);
+        if (verbose) _printLine_("Checking inputs:");
+        if (nlat != nlon){_error2_("Must have same number of lat[" << nlat << "] and lon[" << nlon << "] coordinates.");}
         else                ncoord=nlat;
-        if (sgn != +1 && sgn != -1) _error_("Hemisphere sgn=%d must be +1 (north) or -1 (south).",sgn);
-        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);
+        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).");
 
         x=(double*)mxMalloc(ncoord*sizeof(double));
@@ -74 +74 @@
 
 void Ll2xyUsage(void){
-        _printf_(true,"Ll2xy - lat/long to x/y coordinate transformation module:\n");
-        _printf_(true,"\n");
-        _printf_(true,"   This module transforms lat/long to x/y coordinates.\n");
-        _printf_(true,"\n");
-        _printf_(true,"   Usage:\n");
-        _printf_(true,"      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);\n");
-        _printf_(true,"\n");
-        _printf_(true,"      lat         latitude coordinates (double vector)\n");
-        _printf_(true,"      lon         longitude coordinates (double vector)\n");
-        _printf_(true,"      sgn         sign for hemisphere (double, +1 (north) or -1 (south))\n");
-        _printf_(true,"\n");
-        _printf_(true,"      central_meridian     central meridian (double, optional, but must specify with sp)\n");
-        _printf_(true,"      standard_parallel    standard parallel (double, optional, but must specify with cm)\n");
-        _printf_(true,"\n");
-        _printf_(true,"      x           x coordinates (double vector)\n");
-        _printf_(true,"      y           y coordinates (double vector)\n");
-        _printf_(true,"\n");
-        _printf_(true,"   Examples:\n");
-        _printf_(true,"      [x,y]=Ll2xy(lat,lon, 1);\n");
-        _printf_(true,"      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);\n");
-        _printf_(true,"      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);\n");
-        _printf_(true,"\n");
+        _pprintLine_("Ll2xy - lat/long to x/y coordinate transformation module:");
+        _pprintLine_("");
+        _pprintLine_("   This module transforms lat/long to x/y coordinates.");
+        _pprintLine_("");
+        _pprintLine_("   Usage:");
+        _pprintLine_("      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);");
+        _pprintLine_("");
+        _pprintLine_("      lat         latitude coordinates (double vector)");
+        _pprintLine_("      lon         longitude coordinates (double vector)");
+        _pprintLine_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))");
+        _pprintLine_("");
+        _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
+        _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
+        _pprintLine_("");
+        _pprintLine_("      x           x coordinates (double vector)");
+        _pprintLine_("      y           y coordinates (double vector)");
+        _pprintLine_("");
+        _pprintLine_("   Examples:");
+        _pprintLine_("      [x,y]=Ll2xy(lat,lon, 1);");
+        _pprintLine_("      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);");
+        _pprintLine_("      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);");
+        _pprintLine_("");
 }