Changeset 25734

Timestamp:

11/03/20 12:21:13 (4 years ago)

Author:

dlcheng

Message:

CHG: Revert modification to contrib/morlighem/modeldata/interpBedmachineGreenland.m

File:

• issm/trunk-jpl/src/m/contrib/morlighem/modeldata/interpBedmachineGreenland.m (modified) (2 diffs)

issm/trunk-jpl/src/m/contrib/morlighem/modeldata/interpBedmachineGreenland.m

@@ -54 +54 @@
                 morlighem2013nc=['/home/ModelData/Greenland/BedMachine/' basename '-' ncdate '.nc'];
         otherwise
-                morlighem2013nc=['/Users/larour/ModelData/BedMachine/' basename '-' ncdate '.nc'];
-                disp('machine not supported yet, using default path /Users/larour/ModelData/BedMachine/');
+                error('machine not supported yet');
 end
 
@@ -82 +81 @@
 data(find(data==-9999))=NaN;
 
-ydata=flipud(ydata);
-data=flipud(data);
-    
 disp(['   -- BedMachine Greenland: interpolating ' string]);
 if strcmp(string,'mask') | strcmp(string,'source'),
         %Need nearest neighbor to avoid interpolation between 0 and 2
-        output = InterpFromGridToMesh(xdata,ydata,data,double(X),double(Y),'nearest');
+        output = InterpFromGrid(xdata,ydata,data,double(X),double(Y),'nearest');
 else
-    
-        output = InterpFromGridToMesh(xdata,ydata,data,double(X),double(Y),NaN);
+        output = InterpFromGrid(xdata,ydata,data,double(X),double(Y));
 end