Changeset 16137 for issm/trunk/src/m/interp/InterpFromFile.m

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/interp/InterpFromFile.m (modified) (1 diff)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/m/interp/InterpFromFile.m

@@ -38 +38 @@
 Names=FieldFindVarNames(filename);
 Data=load(filename);
+disp('WARNING: function deprecated, replace InterpFromFile by the following command:');
 if strcmpi(Names.interp,'node'),
+        disp(['   data=InterpFromGridToMesh(' Names.xname ',' Names.yname ',' Names.dataname ',x,y,default_value);']);
         data_out=InterpFromGridToMesh(Data.(Names.xname),Data.(Names.yname),Data.(Names.dataname),x,y,default_value);
 else
+        disp(['   data=InterpFromMeshToMesh2d(' Names.indexname ',' Names.xname ',' Names.yname ',' Names.dataname ',x,y);']);
         data_out=InterpFromMeshToMesh2d(Data.(Names.indexname),Data.(Names.xname),Data.(Names.yname),Data.(Names.dataname),x,y);
 end

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad