Changeset 15396 for issm/trunk/src/c/modules/InterpFromMesh2dx

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (modified) (6 diffs)
• src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.h (modified) (3 diffs)
• src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (modified) (3 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -5 +5 @@
 #include "./InterpFromMesh2dx.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
-#include "../../classes/objects/objects.h"
-#include "../modules.h"
+#include "../../classes/classes.h"
+#include "../ContourToNodesx/ContourToNodesx.h"
 
-int InterpFromMesh2dx(SeqVec<IssmPDouble>** pdata_prime,
+int InterpFromMesh2dx(IssmSeqVec<IssmPDouble>** pdata_prime,
                         double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length,
                         double* x_prime, double* y_prime, int nods_prime,
@@ -16 +15 @@
 
         /*Output*/
-        SeqVec<IssmPDouble>* data_prime=NULL;
+        IssmSeqVec<IssmPDouble>* data_prime=NULL;
 
         /*Intermediary*/
@@ -26 +25 @@
 
         /*contours: */
-        SeqVec<IssmPDouble> *vec_incontour = NULL;
         double              *incontour     = NULL;
 
@@ -70 +68 @@
 
         /*Initialize output*/
-        data_prime=new SeqVec<IssmPDouble>(nods_prime);
+        data_prime=new IssmSeqVec<IssmPDouble>(nods_prime);
         if(num_default_values){
                 if(num_default_values==1)for (i=0;i<nods_prime;i++) data_prime->SetValue(i,default_values[0],INS_VAL);
@@ -78 +76 @@
         /*Build indices of contour: */
         if(numcontours){
-                ContourToNodesx( &vec_incontour,x_prime,y_prime,nods_prime,contours,numcontours,1);
-                incontour=vec_incontour->ToMPISerial();
+                ContourToNodesx( &incontour,x_prime,y_prime,nods_prime,contours,numcontours,1);
         }
         else{
@@ -112 +109 @@
          xDelete<double>(incontour);
         *pdata_prime=data_prime;
+        return 1;
 }

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

@@ -6 +6 @@
 #define _INTERPFROMMESH2DX_H
 
-#include "../../classes/objects/objects.h"
+#include "../../classes/classes.h"
 #include "../../toolkits/toolkits.h"
 
@@ -22 +22 @@
         double              ymin,ymax;
         int                 nods_prime;
-        SeqVec<IssmPDouble> *data_prime;
+        IssmSeqVec<IssmPDouble> *data_prime;
         double              *x_prime;
         double              *y_prime;
@@ -31 +31 @@
 } InterpFromMesh2dxThreadStruct;
 
-int InterpFromMesh2dx(SeqVec<IssmPDouble>** pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,
+int InterpFromMesh2dx(IssmSeqVec<IssmPDouble>** pdata_prime,double* index_data, double* x_data, double* y_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, int nods_prime,
                 double* default_values,int num_default_values,Contour<IssmPDouble>** contours,int numcontours);
 

issm/trunk/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

@@ -32 +32 @@
         double  ymax                    = gate->ymax;
         int     nods_prime              = gate->nods_prime;
-        SeqVec<IssmPDouble>* data_prime = gate->data_prime;
+        IssmSeqVec<IssmPDouble>* data_prime = gate->data_prime;
         double *x_prime                 = gate->x_prime;
         double *y_prime                 = gate->y_prime;
@@ -47 +47 @@
                 /*display current iteration*/
                 if (debug && my_thread==0 && fmod((double)i,(double)100)==0)
-                 _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i-i0)/double(i1-i0)*100<<"%");
+                 _printf_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i-i0)/double(i1-i0)*100<<"%");
 
                 /*if there is no point inside the domain, go to next iteration*/
@@ -99 +99 @@
         }
         if(debug && my_thread==0)
-         _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+         _printf_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%\n");
         return NULL;
 }

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache