Changeset 23285

Timestamp:

09/14/18 20:19:12 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: enable compilation with proj.4

Location:

issm/trunk-jpl/src/c/modules

Files:

• CoordinateSystemTransformx/CoordinateSystemTransformx.cpp (modified) (2 diffs)
• CoordinateSystemTransformx/CoordinateSystemTransformx.h (modified) (1 diff)
• ModelProcessorx/CreateNodes.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.cpp

@@ -9 +9 @@
 #include <proj_api.h>
 
-void CoordinateSystemTransformx(IssmDouble** px_dest,IssmDouble** py_dest,IssmDouble* x_src,IssmDouble* y_src,int size,const char* str_src,const char* str_dst){
+void CoordinateSystemTransformx(double** px_dest,double** py_dest,double* x_src,double* y_src,int size,const char* str_src,const char* str_dst){
 
 #if !defined(_HAVE_PROJ4_)
@@ -17 +17 @@
         /*Allocate output and initialize values as src*/
         _assert_(size>0);
-        IssmDouble* x_dest = xNew<IssmDouble>(size);
-        IssmDouble* y_dest = xNew<IssmDouble>(size);
+        double* x_dest = xNew<double>(size);
+        double* y_dest = xNew<double>(size);
         for(int i=0;i<size;i++){
                 x_dest[i] = x_src[i];

issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.h

@@ -8 +8 @@
 
 /* local prototypes: */
-void CoordinateSystemTransformx(IssmDouble** px_dest,IssmDouble** py_dest,IssmDouble* x_src,IssmDouble* y_src,int size,const char* str_src,const char* str_dst);
+void CoordinateSystemTransformx(double** px_dest,double** py_dest,double* x_src,double* y_src,int size,const char* str_src,const char* str_dst);
 #endif  

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNodes.cpp

@@ -32 +32 @@
                                 for(j=0;j<3;j++){
                                         if(my_nodes[3*i+j]){ 
-                                                nodes->AddObject(new Node(id0+3*i+j+1,id0+3*i+j,lid++,iomodel->elements[+3*i+j]-1,iomodel,analysis,approximation));
+                                                nodes->AddObject(new Node(id0+3*i+j+1,id0+3*i+j,lid++,iomodel->elements[3*i+j]-1,iomodel,analysis,approximation));
 
                                         }