Changeset 2396

Timestamp:

10/08/09 09:55:53 (15 years ago)

Author:

Mathieu Morlighem

Message:

use pairoptions in meshyams

Location:

issm/trunk/src/m/classes/public/mesh

Files:

• meshyams.m (modified) (1 diff)
• process_mesh_options.m (deleted)
• recover_mesh_options.m (deleted)

issm/trunk/src/m/classes/public/mesh/meshyams.m

@@ -22 +22 @@
 
 %recover options
-yamsoptions=optionlist2cell(varargin{:});
-
-%add default options
-yamsoptions=process_mesh_options(yamsoptions);
+options=pairoptions(varargin{:});
+options=deleteduplicates(options,1);
+if ~exist(options,'domainoutline'),
+        error('meshyams error message: no ''domainoutline'' was provided');
+end
+if ~exist(options,'velocities'),
+        error('meshyams error message: no ''velocities'' was provided');
+end
 
 %recover some fields
 disp('MeshYams Options:')
-domainoutline=yamsoptions.domainoutline;   disp(sprintf('   %-15s: ''%s''','DomainOutline',domainoutline));
-groundeddomain=yamsoptions.groundeddomain; disp(sprintf('   %-15s: ''%s''','GroundedDomain',groundeddomain));
-velocities=yamsoptions.velocities;         disp(sprintf('   %-15s: ''%s''','Velocities',velocities));
-resolution=yamsoptions.resolution;         disp(sprintf('   %-15s: %f','Resolution',resolution));
-gradation=yamsoptions.gradation;
-nsteps=yamsoptions.nsteps;                 disp(sprintf('   %-15s: %i','nsteps',nsteps));
-epsilon=yamsoptions.epsilon;               disp(sprintf('   %-15s: %f','epsilon',epsilon));
-hmin=yamsoptions.hmin;                     disp(sprintf('   %-15s: %f','hmin',hmin));
-hmax=yamsoptions.hmax;                     disp(sprintf('   %-15s: %f\n','hmax',hmax));
+domainoutline=getfieldvalue(options,'domainoutline');
+disp(sprintf('   %-15s: ''%s''','DomainOutline',domainoutline));
+groundeddomain=getfieldvalue(options,'groundeddomain','N/A');
+disp(sprintf('   %-15s: ''%s''','GroundedDomain',groundeddomain));
+velocities=getfieldvalue(options,'velocities');
+disp(sprintf('   %-15s: ''%s''','Velocities',velocities));
+resolution=getfieldvalue(options,'resolution',5000);
+disp(sprintf('   %-15s: %f','Resolution',resolution));
+nsteps=getfieldvalue(options,'nsteps',6);
+disp(sprintf('   %-15s: %i','nsteps',nsteps));
+gradation=getfieldvalue(options,'gradation',2*ones(nsteps,1));
+disp(sprintf('   %-15s: %g','gradation',gradation(1)));
+epsilon=getfieldvalue(options,'epsilon',3);
+disp(sprintf('   %-15s: %f','epsilon',epsilon));
+hmin=getfieldvalue(options,'hmin',500);
+disp(sprintf('   %-15s: %f','hmin',hmin));
+hmax=getfieldvalue(options,'hmax',150*10^3);
+disp(sprintf('   %-15s: %f\n','hmax',hmax));
 
 %mesh with initial resolution