Changeset 12049 for issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp

Timestamp:

04/18/12 15:16:17 (13 years ago)

Author:

Mathieu Morlighem

Message:

Using FetchData to recover Options

File:

• issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp (modified) (5 diffs)

issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp

@@ -12 +12 @@
         int     nx,ny,ncoord;
         int     sgn;
-
         Options* options=NULL;
         double   cm=0.,sp=0.;
@@ -25 +24 @@
         /*checks on arguments on the matlab side: */
         if (nlhs > NLHS) {
-                Xy2llUsage();
-                _error_("Xy2ll usage error");
+                Xy2llUsage(); _error_("Xy2ll usage error");
         }
         if (nrhs < NRHS) {
-                Xy2llUsage();
-                _error_("Xy2ll usage error");
+                Xy2llUsage(); _error_("Xy2ll usage error");
         }
 
         /*Input datasets: */
-        if (verbose) printf("Fetching inputs:\n");
         FetchData(&x,&nx,X_IN);
-        if (verbose)
-                if   (nx == 1) printf("  x=%g\n",x[0]);
-                else           printf("  x=[%d values]\n",nx);
-//      for (i=0; i<nx; i++) printf("  x[%d]=%g\n",i,x[i]);
         FetchData(&y,&ny,Y_IN);
-        if (verbose)
-                if   (ny == 1) printf("  y=%g\n",y[0]);
-                else           printf("  y=[%d values]\n",ny);
-//      for (i=0; i<ny; i++) printf("  y[%d]=%g\n",i,y[i]);
         FetchData(&sgn,SGN_IN);
-        if (verbose) printf("  sgn=%d\n",sgn);
+        FetchData(&options,NRHS,nrhs,prhs);
 
-        if (verbose) printf("Parsing options:\n");
-        options=new Options(NRHS,nrhs,prhs);
-        if (options->Size()) for(i=0;i<options->Size();i++) ((Option*)options->GetObjectByOffset(i))->DeepEcho();
         /*  defaults are in Xy2lldef, so don't duplicate them here, and only use user values if both have been specified  */
         if (options->GetOption("central_meridian") || options->GetOption("standard_parallel")) {
@@ -60 +45 @@
 
         /*some checks*/
-        if (verbose) printf("Checking inputs:\n");
-
         if   (nx != ny) _error_("Must have same number of x[%d] and y[%d] coordinates.",nx,ny);
         else            ncoord=nx;
@@ -68 +51 @@
         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));
-        lon=(double *)xmalloc(ncoord*sizeof(double));
+        lat=(double*)mxMalloc(ncoord*sizeof(double));
+        lon=(double*)mxMalloc(ncoord*sizeof(double));
 
         /* Run core computations: */
         if (verbose) printf("Calling core:\n");
         if (options->GetOption("central_meridian") && options->GetOption("standard_parallel"))
-                iret=Xy2llx(lat,lon,
-                                        x,y,ncoord,
-                                        sgn,cm,sp);
+                iret=Xy2llx(lat,lon,x,y,ncoord,sgn,cm,sp);
         else
-                iret=Xy2llx(lat,lon,
-                                        x,y,ncoord,
-                                        sgn);
-        if (verbose) printf("  iret=%d\n",iret);
+                iret=Xy2llx(lat,lon,x,y,ncoord,sgn);
 
         /*Write data: */
@@ -94 +72 @@
 }
 
-void Xy2llUsage(void)
-{
+void Xy2llUsage(void){
         _printf_(true,"Xy2ll - x/y to lat/long coordinate transformation module:\n");
         _printf_(true,"\n");