Index: /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp =================================================================== --- /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 8697) +++ /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 8698) @@ -3,13 +3,9 @@ #include "./Ll2xyx.h" +#include "../../include/include.h" #include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include -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){ /* This is a cpp conversion of the following: %LL2XY - converts lat long to polar stereographic @@ -26,31 +22,24 @@ % -1 : south latitude (default is mer=0 lat=71) */ - double delta,slat; bool flag=true; /* Get central_meridian and standard_parallel depending on hemisphere */ - if (sgn == 1) { - delta = 45; + 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; + 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"); + else _error_("Sign should be either +1 or -1.\n"); - return(Ll2xyx(x,y, - lat,lon,ncoord, - sgn,delta,slat)); + return(Ll2xyx(x,y, lat,lon,ncoord, sgn,delta,slat)); } -int Ll2xyx(double* x, double* y, - double* lat, double* lon, int ncoord, - int sgn, double central_meridian, double standard_parallel){ - +int Ll2xyx(double* x, double* y, double* lat, double* lon, int ncoord, int sgn, double central_meridian, double standard_parallel){ /* This is a cpp conversion of the following: %LL2XY - converts lat long to polar stereographic @@ -74,6 +63,10 @@ double T,rho,sl,tc,mc; +<<<<<<< .mine + if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1"); +======= if ((sgn != 1) && (sgn != -1)) _error_("Sign should be either +1 or -1.\n"); +>>>>>>> .r8690 delta = central_meridian; @@ -81,36 +74,33 @@ /* Conversion constant from degrees to radians */ - cde = 57.29577951; + cde = 57.29577951; /* Radius of the earth in meters */ - re = 6378.273*pow(10.,3.); + re = 6378.273*pow(10.,3.); /* Eccentricity of the Hughes ellipsoid squared */ - ex2 = .006693883; + ex2 = 0.006693883; /* Eccentricity of the Hughes ellipsoid */ - ex = sqrt(ex2); - /* pi is not defined in cpp */ - pi = 4.*atan(1.); + ex = sqrt(ex2); /* loop over all the coordinate pairs */ - - for (i=0; i= pi / 2.) { + if (latitude>= PI/2.){ x[i] = 0.0; y[i] = 0.0; @@ -118,6 +108,4 @@ } } - return(iret); } - Index: /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.h =================================================================== --- /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.h (revision 8697) +++ /issm/trunk/src/c/modules/Ll2xyx/Ll2xyx.h (revision 8698) @@ -7,12 +7,6 @@ /* local prototypes: */ -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); +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); #endif /* _LL2XYX_H */ - Index: /issm/trunk/src/c/modules/Xy2llx/Xy2llx.cpp =================================================================== --- /issm/trunk/src/c/modules/Xy2llx/Xy2llx.cpp (revision 8697) +++ /issm/trunk/src/c/modules/Xy2llx/Xy2llx.cpp (revision 8698) @@ -3,13 +3,9 @@ #include "./Xy2llx.h" +#include "../../include/include.h" #include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include -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){ /* This is a cpp conversion of the following: %XY2LL - converts xy to lat long @@ -32,26 +28,20 @@ /* Get central_meridian and standard_parallel depending on hemisphere */ - if (sgn == 1) { - delta = 45; + 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; + 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"); + 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,delta,slat)); } -int Xy2llx(double* lat, double* lon, - double* x, double* y, int ncoord, - int sgn, double central_meridian, double standard_parallel){ - +int Xy2llx(double* lat, double* lon, double* x, double* y, int ncoord, int sgn, double central_meridian, double standard_parallel){ /* This is a cpp conversion of the following: %XY2LL - converts xy to lat long @@ -75,6 +65,5 @@ double sl,rho,cm,T,chi; - if ((sgn != 1) && (sgn != -1)) - _error_("Sign should be either +1 or -1.\n"); + if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n"); delta = central_meridian; @@ -86,24 +75,21 @@ re = 6378.273*pow(10.,3.); /* Eccentricity of the Hughes ellipsoid squared */ - ex2 = .006693883; + ex2 = 0.006693883; /* Eccentricity of the Hughes ellipsoid */ - ex = sqrt(ex2); - /* pi is not defined in cpp */ - pi = 4.*atan(1.); + ex = sqrt(ex2); /* loop over all the coordinate pairs */ + for(i=0; i