Changeset 27277

Timestamp:

09/10/22 06:13:08 (3 years ago)

Author:

vverjans

Message:

BUG reverting files that should not have been modified

Location:

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

Files:

• interpBedmachineGreenland.m (modified) (2 diffs)
• interpSeaRISE.m (modified) (2 diffs)

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

@@ -45 +45 @@
                 ['/Users/larour/ModelData/BedMachine/' basename '-' ncdate '.nc'],...
                 ['./' basename '-' ncdate '.nc'],...
-                '/media/vincent/TOSH4TB/GeorgiaTech/DataSearch/BedMachine/BedMachineGreenland-2021-04-20.nc',...
                 };
 
@@ -90 +89 @@
 if strcmp(string,'mask') | strcmp(string,'source'),
         %Need nearest neighbor to avoid interpolation between 0 and 2
-        %output = InterpFromGrid(xdata,ydata,data,double(X),double(Y),'nearest');
-        output = InterpFromGridToMesh(xdata,flipud(ydata),flipud(data),double(X),double(Y),NaN); %VV
+        output = InterpFromGrid(xdata,ydata,data,double(X),double(Y),'nearest');
 else
-        %output = InterpFromGrid(xdata,ydata,data,double(X),double(Y));
-        output = InterpFromGridToMesh(xdata,flipud(ydata),flipud(data),double(X),double(Y),NaN); %VV
+        output = InterpFromGrid(xdata,ydata,data,double(X),double(Y));
 end
 

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

@@ -58 +58 @@
                         searisenc='/totten_1/ModelData/SeaRISE/Antarctica_5km_dev1.0.nc';
                 end
-   case {'vincentxps159500'}
-                if hemisphere==1
-                        searisenc = '/media/vincent/TOSH4TB/GeorgiaTech/ISSM/fromSeroussi/GrIS04Feb2022/seariseData/Greenland_5km_dev1.2.nc';
-                end
         otherwise
                 error('hostname not supported yet');
@@ -84 +80 @@
 if verbose, disp(['   -- SeaRISE: interpolating ' string]); end
 if strcmpi(string,'LandMask');
-        %dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj,'nearest');
-        dataout = InterpFromGridToMesh(xdata,ydata,data,xproj,yproj,NaN); %VV
+        dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj,'nearest');
 else
-        %dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj);
-        dataout = InterpFromGridToMesh(xdata,ydata,data,xproj,yproj,NaN); %VV
+        dataout = InterpFromGrid(xdata,ydata,data,xproj,yproj);
 end
 dataout = reshape(dataout,size(X,1),size(X,2));