Changeset 23875

Timestamp:

04/19/19 16:02:30 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some minor changes

Location:

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

Files:

• interpBedmachineAntarctica.m (modified) (1 diff)
• interpBedmachineGreenland.m (modified) (1 diff)
• interpBedmap2.m (modified) (2 diffs)
• interpChuter2015.m (added)
• interpDTU19MDT.m (added)
• interpMouginotAnt2017.m (modified) (1 diff)
• interpMouginotAnt2019.m (added)

issm/trunk-jpl/src/m/contrib/morlighem/ronne/interpBedmachineAntarctica.m

@@ -27 +27 @@
         ncdate='2018-09-26';
         ncdate='2018-11-14';
-        ncdate='2019-01-24';
         ncdate='2019-01-30';
-        ncdate='2019-02-15';
-        ncdate='2019-02-21'; % no need of firn correction
-        ncdate='2019-02-22'; % no need of firn correction
-        ncdate='2019-02-24'; % no need of firn correction
+        ncdate='2019-03-12';
+        ncdate='2019-04-02';
+        ncdate='2019-04-15';
         ncdate='2019-04-15'; % no need of firn correction
 end
 
-date1 = sscanf(ncdate,'%d-%d-%d');
-date2 = datetime(date1(1),date1(2),date1(3));
-
-if date2<datetime(2016,10,24),
-        basename = 'AntarcticaMCdataset';
-else
-  basename = 'BedMachineAntarctica';
-end
+basename = 'BedMachineAntarctica';
 
 %read data

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

@@ -32 +32 @@
         ncdate='2017-09-25'; %BedMachine v3
         ncdate='2018-06-01';
-        ncdate='2018-08-27';
+        ncdate='2019-04-18';
 end
 

issm/trunk-jpl/src/m/contrib/morlighem/ronne/interpBedmap2.m

@@ -9 +9 @@
 %      5. rockmask                     is a mask file showing rock outcrops
 %      6. lakemask_vostok              is a mask file showing the extent of the lake cavity of Lake Vostok
-%      7. bed_uncertainty              is the bed uncertainty grid shown in figure 12 of the manuscript
+%      7. grounded_bed_uncertainty     is the bed uncertainty grid shown in figure 12 of the manuscript
 %      8. thickness_uncertainty_5km    is the thickness uncertainty grid shown in figure 11 of the manuscript
 %      9. coverage                     is a binary grid showing the distribution of ice thickness data used in the grid of ice thickness
@@ -19 +19 @@
 
 nc = '/home/ModelData/Antarctica/BedMap2/bedmap2_bin/Bedmap2.nc';
-nc = '/Users/mmorligh/temp/Bedmap2.nc';
 
-xdata = double(ncread(nc,'x'));
-ydata = double(ncread(nc,'y'));
+if strcmp(string,'thickness_uncertainty_5km')
+        xdata = double(ncread(nc,'x_5km'));
+        ydata = double(ncread(nc,'y_5km'));
+else
+        xdata = double(ncread(nc,'x'));
+        ydata = double(ncread(nc,'y'));
+end
 
 offset=2;

issm/trunk-jpl/src/m/contrib/morlighem/ronne/interpMouginotAnt2017.m

@@ -1 @@
-function [vxout vyout]= interpRignot2012(X,Y),
+function [vxout vyout]= interpMouginotAnt2017(X,Y),
 
-filename = '/home/ModelData/Greenland/VelMouginot/RignotGreenland2012Vel.mat';
+%read data
+switch (oshostname()),
+        case {'ronne'}
+                nc = '/home/ModelData/Antarctica/MouginotVel/vel_nsidc.CF16_2.nc';
+        otherwise
+                error('hostname not supported yet');
+end
 
-
-%Figure out what subset of the matrix should be read
-load(filename,'x','y');
-velfile = matfile(filename);
+xdata = double(ncread(nc,'x'));
+ydata = double(ncread(nc,'y'));
 
 offset=2;
 
 xmin=min(X(:)); xmax=max(X(:));
-posx=find(x<=xmax);
-id1x=max(1,find(x>=xmin,1)-offset);
-id2x=min(numel(x),posx(end)+offset);
+posx=find(xdata<=xmax);
+id1x=max(1,find(xdata>=xmin,1)-offset);
+id2x=min(numel(xdata),posx(end)+offset);
 
 ymin=min(Y(:)); ymax=max(Y(:));
-%posy=find(y>=ymin);
-%id1y=max(1,find(y<=ymax,1)-offset);
-%id2y=min(numel(y),posy(end)+offset);
-posy=find(y<=ymax);
-id1y=max(1,find(y>=ymin,1)-offset);
-id2y=min(numel(y),posy(end)+offset);
+posy=find(ydata>=ymin);
+id1y=max(1,find(ydata<=ymax,1)-offset);
+id2y=min(numel(ydata),posy(end)+offset);
 
-vx = velfile.vx(id1y:id2y,id1x:id2x);
-vy = velfile.vy(id1y:id2y,id1x:id2x);
-x = x(id1x:id2x);
-y = y(id1y:id2y);
+disp(['   -- Mouginot 2017: loading velocities']);
+vxdata = double(ncread(nc,'VX',[id1x id1y],[id2x-id1x+1 id2y-id1y+1],[1 1]))';
+vydata = double(ncread(nc,'VY',[id1x id1y],[id2x-id1x+1 id2y-id1y+1],[1 1]))';
+xdata=xdata(id1x:id2x);
+ydata=ydata(id1y:id2y);
 
-%load(filename);
-vxout = InterpFromGrid(x,y,double(vx),X,Y);
-vyout = InterpFromGrid(x,y,double(vy),X,Y);
+disp(['   -- Mouginot 2017: interpolating ']);
+vxout = InterpFromGrid(xdata,ydata,vxdata,double(X),double(Y));
+vyout = InterpFromGrid(xdata,ydata,vydata,double(X),double(Y));
 
+%return vel if only one output is requested
 if nargout==1,
         vxout = sqrt(vxout.^2+vyout.^2);