Changeset 18324

Timestamp:

08/03/14 19:08:20 (11 years ago)

Author:

Eric.Larour

Message:

CHG: minor changes for Greenland.

File:

• issm/branches/trunk-jpl-ad2/src/m/plot/prepare_gl.m (modified) (2 diffs)

issm/branches/trunk-jpl-ad2/src/m/plot/prepare_gl.m

@@ -13 +13 @@
 %database: {{{
 if strcmpi(md.mesh.hemisphere','s'),
-        geotiff_name_earth=['/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_200m.wgs84.tif'];
         radar_image_earth='/Users/larour/ModelData/TrueMarble_GeoTIFF/radar_no_antarctica.png';
-        triangulation_earth='/Users/larour/ModelData/DEM_geotiff/processed/triangulation.mat';
+        triangulation_earth='/Users/larour/ModelData/DEM_geotiff/processed/triangulation_antarctica.mat';
         triangulation='/Users/larour/ModelData/BamberDEMAntarctica1km/triangulated/triangulation_15.mat';
         radar_image='/Users/larour/ModelData/BamberDEMAntarctica1km/triangulated/radar.latlong.png';
 
 elseif strcmpi(md.mesh.hemisphere','n'),
-        geotiff_name_earth=['/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_200m.wgs84.tif'];
         radar_image_earth='/Users/larour/ModelData/TrueMarble_GeoTIFF/radar_no_greenland.png';
+        triangulation_earth='/Users/larour/ModelData/DEM_geotiff/processed/triangulation_greenland.mat';
         triangulation='/u/astrid-r1b/ModelData/HowatDEMGreenland2012/triangulated/triangulation_15.mat';
-        radar_image='/u/astrid-r1b/ModelData/HowatDEMGreenland2012/triangulated/radar.png';
-        triangulation_hd='/u/astrid-r1b/ModelData/HowatDEMGreenland2012/triangulated/triangulation_2.mat';
+        radar_image='/u/astrid-r1b/ModelData/HowatDEMGreenland2012/triangulated/radar.latlong.png';
 else
         error('prepare_gl error usage: ''hemisphere'' should be set to ''s'' or ''n''');
@@ -147 +145 @@
 R=6371000*ones(length(x),1)+scaling_factor*surface;
 
-[lat,long]=xy2ll(x,y,-1);
+if strcmpi(md.mesh.hemisphere','s'),
+        [lat,long]=xy2ll(x,y,-1);
+elseif strcmpi(md.mesh.hemisphere','n'),
+        [lat,long]=xy2ll(x,y,1);
+end
 
 x = R .* cosd(lat) .* cosd(long);