Changeset 21607

Timestamp:

03/13/17 10:05:49 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/examples

Files:

• Jakobshavn/runme.m (modified) (2 diffs)
• Pig/runme.m (modified) (5 diffs)

issm/trunk-jpl/examples/Jakobshavn/runme.m

@@ -8 +8 @@
         ncdata='../Data/Greenland_5km_dev1.2.nc';
         if ~exist(ncdata,'file'), 
-                error('File Greenland_5km_dev1.2.nc not downloaded in Data Directory.  Please cd ../Data and run the download script.');
+                error('File Greenland_5km_dev1.2.nc not downloaded in Data Directory');
         end
         x1   = ncread(ncdata,'x1');
@@ -74 +74 @@
 
         plotmodel(md,'unit#all','km','axis#all','equal',...
-                'FontSize#all',12,...
                 'data',md.inversion.vel_obs,'title','Observed velocity',...
                 'data',md.results.StressbalanceSolution.Vel,'title','Modeled Velocity',...
-                'colorbar#1','off','colorbar#2','on','colorbartitle#2','[m/yr]',...
+                'colorbar#1','off','colorbartitle#2','(m/yr)',...
                 'caxis#1-2',[0,7000],...
                 'data',md.geometry.base,'title','Base elevation',...
                 'data',md.results.StressbalanceSolution.FrictionCoefficient,...
                 'title','Friction Coefficient',...
-                'colorbar#3','on','colorbartitle#3','[m]','colorbar#4','on');
+                'colorbartitle#3','(m)');
 end

issm/trunk-jpl/examples/Pig/runme.m

@@ -12 +12 @@
         % Generate an initial uniform mesh (resolution = hinit m)
         md=bamg(model,'domain',domain,'hmax',hinit);
-
-        %ploting
-        plotmodel(md,'data','mesh')
-        return;
 
         % Load Velocities
@@ -104 +100 @@
         % Control general
         md.inversion.iscontrol=1;
-        md.inversion.maxstepss=20;
+        md.inversion.maxsteps=20;
         md.inversion.maxiter=40;
         md.inversion.dxmin=0.1;
         md.inversion.gttol=1.0e-4;
-        md.verbose=verbose('solution',true,'control',true);
+        md.verbose=verbose('control',true);
 
         % Cost functions
@@ -145 +141 @@
         md = loadmodel('./Models/PIG_Control_drag');
 
-        plotmodel(md,'axis#all','equal',...
-                'xlim#all',[min(md.mesh.x) max(md.mesh.x)]/10^3,...
-                'ylim#all',[min(md.mesh.y) max(md.mesh.y)]/10^3,...
-                'FontSize#all',12,...
+        plotmodel(md,...
                 'data',md.initialization.vel,'title','Observed velocity',...
                 'data',md.results.StressbalanceSolution.Vel,'title','Modeled Velocity',...
                 'data',md.geometry.base,'title','Bed elevation',...
                 'data',md.results.StressbalanceSolution.FrictionCoefficient,'title','Friction Coefficient',...
-                'colorbar#all','on','colorbartitle#1-2','[m/yr]',...
+                'colorbar#all','on','colorbartitle#1-2','(m/yr)',...
                 'caxis#1-2',([1.5,4000]),...
-                'colorbartitle#3','[m]', 'log#1-2',10);
+                'colorbartitle#3','(m)', 'log#1-2',10);
 end
 
@@ -183 +176 @@
 
         plotmodel(mdHO,'nlines',3,'ncols',2,'axis#all','equal',...
-                                                'xlim#all',[min(mdHO.mesh.x) max(mdHO.mesh.x)]/10^3,...
-                                                'ylim#all',[min(mdHO.mesh.y) max(mdHO.mesh.y)]/10^3,...
-                                                'FontSize#all',12,...
                                                 'data',mdHO.initialization.vel,'title','Observed velocity',...
                                                 'data',(mdHO.results.StressbalanceSolution.Vel(surf)-mdHO.initialization.vel(surf)),'title','(HO-observed) velocities',...
@@ -194 +184 @@
                                                 'caxis#1',([1.5,4000]),'caxis#3',([1.5,4000]),'caxis#5',([1.5,4000]),...
                                                 'colorbar#all','on','view#all',2,...
-                                                'colorbartitle#all','[m/yr]',...
+                                                'colorbartitle#all','(m/yr)',...
                                                 'layer#5',1, 'log#1', 10,'log#3', 10,'log#5', 10);
 end