Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp

    r6412 r11995  
    77#include "../../include/include.h"
    88
    9 int InterpFromMeshToMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) {
     9int InterpFromMeshToMesh3dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) {
    1010
    1111        /*Output*/
    12         Vec data_prime=NULL;
     12        Vector* data_prime=NULL;
    1313
    1414        /*Intermediary*/
    … …  
    5454
    5555        /*Initialize output*/
    56         data_prime=NewVec(nods_prime);
    57         for (i=0;i<nods_prime;i++) VecSetValue(data_prime,i,default_value,INSERT_VALUES);
     56        data_prime=new Vector(nods_prime);
     57        for (i=0;i<nods_prime;i++) data_prime->SetValue(i,default_value,INS_VAL);
    5858
    5959        /*Loop over the elements*/
    … …  
    127127
    128128                                        /*insert value and go to the next point*/
    129                                         VecSetValue(data_prime,j,data_value,INSERT_VALUES);
     129                                        data_prime->SetValue(j,data_value,INS_VAL);
    130130                                }
    131131                        }
Note: See TracChangeset for help on using the changeset viewer.