Changeset 8715

Timestamp:

06/24/11 14:15:04 (14 years ago)

Author:

jschierm

Message:

Extract defaults from Xy2llx and Ll2xyx into separate functions (and fix reformatting).

Location:

issm/trunk/src/c/modules

Files:

• Ll2xyx/Ll2xyx.cpp (modified) (3 diffs)
• Ll2xyx/Ll2xyx.h (modified) (1 diff)
• Xy2llx/Xy2llx.cpp (modified) (4 diffs)
• Xy2llx/Xy2llx.h (modified) (1 diff)

issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp

@@ -22 +22 @@
 %                               -1 : south latitude (default is mer=0  lat=71)
 */
-        double  delta,slat;
-        bool    flag=true;
+        double  central_meridian,standard_parallel;
 
-        /*  Get central_meridian and standard_parallel depending on hemisphere  */
-        if (sgn ==  1) {
-                delta= 45;
-                slat = 70;
-                _printf_(flag,"Info: creating coordinates in polar stereographic (Std Latitude: 70N Meridian: 45).\n");
-        }
-        else if (sgn == -1) {
-                delta= 0;
-                slat = 71;
-                _printf_(flag,"Info: creating coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).\n");
-        }
-        else _error_("Sign should be either +1 or -1.\n");
+        Ll2xydef(&central_meridian,&standard_parallel,sgn);
 
-        return(Ll2xyx(x,y, lat,lon,ncoord, sgn,delta,slat));
+        return(Ll2xyx(x,y,lat,lon,ncoord,sgn,central_meridian,standard_parallel));
 }
 
@@ -59 +47 @@
         int     i,iret=0;
         double  delta,slat;
-        double  cde,re,ex2,ex,pi;
+        double  cde,re,ex2,ex;
         double  latitude,longitude;
         double  T,rho,sl,tc,mc;
@@ -105 +93 @@
         return(iret);
 }
+
+void Ll2xydef(double* pdelta, double* pslat, int sgn){
+/*  This is a cpp conversion of the following:
+%LL2XY - converts lat long to polar stereographic
+%
+%   Converts from geodetic latitude and longitude to Polar 
+%   Stereographic (X,Y) coordinates for the polar regions.
+%   Author: Michael P. Schodlok, December 2003 (map2ll)
+%
+%   Usage:
+%      [x,y] = ll2xy(lat,lon,sgn)
+%      [x,y] = ll2xy(lat,lon,sgn,central_meridian,standard_parallel)
+%
+%      - sgn = Sign of latitude +1 : north latitude (default is mer=45 lat=70)
+%                               -1 : south latitude (default is mer=0  lat=71)
+*/
+        bool    flag=true;
+
+        /*  Get central_meridian and standard_parallel depending on hemisphere  */
+        if (sgn ==  1) {
+                *pdelta= 45;
+                *pslat = 70;
+                _printf_(flag,"Info: creating coordinates in polar stereographic (Std Latitude: 70N Meridian: 45).\n");
+        }
+        else if (sgn == -1) {
+                *pdelta= 0;
+                *pslat = 71;
+                _printf_(flag,"Info: creating coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).\n");
+        }
+        else _error_("Sign should be either +1 or -1.\n");
+
+        return;
+}

issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.h

@@ -9 +9 @@
 int Ll2xyx(double* x, double* y, double* lat, double* lon, int ncoord, int sgn);
 int Ll2xyx(double* x, double* y, double* lat, double* lon, int ncoord, int sgn, double central_meridian, double standard_parallel);
+void Ll2xydef(double* pdelta, double* pslat, int sgn);
 
 #endif  /* _LL2XYX_H */

issm/trunk/src/c/modules/Xy2llx/Xy2llx.cpp

@@ -23 +23 @@
 %                               -1 : south latitude (default is mer=0  lat=71)
 */
+        double  central_meridian,standard_parallel;
 
-        double  delta,slat;
-        bool    flag=true;
+        Xy2lldef(&central_meridian,&standard_parallel,sgn);
 
-        /*  Get central_meridian and standard_parallel depending on hemisphere  */
-        if (sgn == 1) {
-                delta= 45;
-                slat = 70;
-                _printf_(flag,"Warning: expecting coordinates in polar stereographic (Std Latitude: 70N Meridian: 45).\n");
-        }
-        else if (sgn == -1) {
-                delta= 0;
-                slat = 71;
-                _printf_(flag,"Warning: expecting coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).\n");
-        }
-        else _error_("Sign should be either +1 or -1.\n");
-
-        return(Xy2llx(lat,lon,x,y,ncoord,sgn,delta,slat));
+        return(Xy2llx(lat,lon,x,y,ncoord,sgn,central_meridian,standard_parallel));
 }
 
@@ -62 +49 @@
         int     i,iret=0;
         double  delta,slat;
-        double  cde,re,ex2,ex,pi;
+        double  cde,re,ex2,ex;
         double  sl,rho,cm,T,chi;
 
@@ -106 +93 @@
                 }
 
-                lon[i] = lon[i] * 180. / pi;
-                lat[i] = lat[i] * 180. / pi;
+                lon[i] = lon[i] * 180. / PI;
+                lat[i] = lat[i] * 180. / PI;
                 lon[i] = lon[i] - delta; 
         }
@@ -113 +100 @@
         return(iret);
 }
+
+void Xy2lldef(double* pdelta, double* pslat, int sgn){
+/*  This is a cpp conversion of the following:
+%XY2LL - converts xy to lat long
+%
+%   Converts Polar  Stereographic (X,Y) coordinates for the polar regions to
+%   latitude and longitude Stereographic (X,Y) coordinates for the polar
+%   regions.
+%   Author: Michael P. Schodlok, December 2003 (map2xy.m)
+%
+%   Usage:
+%      [lat,lon] = xy2ll(x,y,sgn);
+%      [lat,lon] = xy2ll(x,y,sgn,central_meridian,standard_parallel);
+%
+%      - sgn = Sign of latitude +1 : north latitude (default is mer=45 lat=70)
+%                               -1 : south latitude (default is mer=0  lat=71)
+*/
+        bool    flag=true;
+
+        /*  Get central_meridian and standard_parallel depending on hemisphere  */
+        if (sgn == 1) {
+                *pdelta= 45;
+                *pslat = 70;
+                _printf_(flag,"Warning: expecting coordinates in polar stereographic (Std Latitude: 70N Meridian: 45).\n");
+        }
+        else if (sgn == -1) {
+                *pdelta= 0;
+                *pslat = 71;
+                _printf_(flag,"Warning: expecting coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).\n");
+        }
+        else _error_("Sign should be either +1 or -1.\n");
+
+        return;
+}

issm/trunk/src/c/modules/Xy2llx/Xy2llx.h

@@ -9 +9 @@
 int Xy2llx(double* lat, double* lon, double* x, double* y, int ncoord, int sgn);
 int Xy2llx(double* lat, double* lon, double* x, double* y, int ncoord, int sgn, double central_meridian, double standard_parallel);
+void Xy2lldef(double* pdelta, double* pslat, int sgn);
 
 #endif  /* _XY2LLX_H */