Changeset 360

Timestamp:

05/12/09 14:55:33 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added setdefaultparameters used in model.m and to plug default parameters onto the model

Location:

issm/trunk/src/m/classes/@model

Files:

• model.m (modified) (12 diffs)
• setdefaultparameters.m (added)

issm/trunk/src/m/classes/@model/model.m

@@ -21 +21 @@
         
         %Mesh
-        md.type='2d';
+        md.type='';
         md.numberofelements=0;
         md.numberofgrids=0;
@@ -61 +61 @@
 
         %Stokes mesh
-        md.stokesreconditioning=10^13;
+        md.stokesreconditioning=0;
         
         %Penalties
         md.penalties=NaN;
-        md.penalty_offset=3;   %penalty=Kmax*10^penalty_offset
-        md.penalty_melting=10^7;%penalty used to keep T<Tpmp
-        md.penalty_lock=10;
-        md.segments=NaN;       %private member, not displayed
-        md.segmentmarkers=NaN; %private member, not displayed
+        md.penalty_offset=0;
+        md.penalty_melting=0;
+        md.penalty_lock=0;
+        md.segments=NaN;
+        md.segmentmarkers=NaN;
         md.rifts=NaN;
         md.numrifts=0;
@@ -84 +84 @@
         md.gridonbed=NaN;
         md.gridonsurface=NaN;
-        md.minh=1;
+        md.minh=0;
         md.firn_layer=NaN;
         md.dof=NaN;
@@ -93 +93 @@
         
         %Materials parameters
-        md.rho_ice=917;
-        md.rho_water=1023;
-        md.heatcapacity=2093;
-        md.latentheat=3.34*10^5; %(J/kg);
-        md.thermalconductivity=2.4; %(W/m/K)
-        md.meltingpoint=273.15; %The melting point of ice at 1 atmosphere of pressure in K
-        md.beta=9.8*10^-8; %dependence of melting on pressure.
-        md.mixed_layer_capacity=3974; %J/kg/K
-        md.thermal_exchange_velocity=1.00*10^-4; %m/s
+        md.rho_ice=0;
+        md.rho_water=0;
+        md.heatcapacity=0;
+        md.latentheat=0;
+        md.thermalconductivity=0;
+        md.meltingpoint=0;
+        md.beta=0;
+        md.mixed_layer_capacity=0;
+        md.thermal_exchange_velocity=0;
         
         %Physical parameters
-        md.g=9.81;
-        md.yts=365*24*3600;
+        md.g=0;
+        md.yts=0;
         md.drag=NaN;
-        md.drag_type=2;
+        md.drag_type=0;
         md.p=NaN;
         md.q=NaN;
@@ -132 +132 @@
 
         %Thermal
-        md.min_thermal_constraints=0; %minimum number of unstable thermal constraints
+        md.min_thermal_constraints=0;
         md.gridondirichlet_thermal=NaN;
         md.dirichletvalues_thermal=NaN;
@@ -153 +153 @@
 
         %Statics parameters
-        md.eps_rel=0.01;
-        md.eps_abs=10;
-        md.sparsity=0.001;
-        md.connectivity=16;
+        md.eps_rel=0;
+        md.eps_abs=0;
+        md.sparsity=0;
+        md.connectivity=0;
         md.lowmem=0;
-        md.viscosity_overshoot=0.3;
+        md.viscosity_overshoot=0;
         
         %Transient parameters
@@ -166 +166 @@
         md.transient_results=NaN;
         md.thermaltransient_results=NaN;
-        md.timestepping=0; %no adaptative time stepping by default.
-        md.deltaH=10^-2; %meters
-        md.DeltaH=50; %meters
-        md.deltaT=10^-2; %K
-        md.DeltaT=1; %K
-        md.timeacc=2;
-        md.timedec=.5;
-
+        md.timestepping=0;
+        md.deltaH=0;
+        md.DeltaH=0;
+        md.deltaT=0;
+        md.DeltaT=0;
+        md.timeacc=0;
+        md.timedec=0;
 
         %Control
-        md.control_type='drag';
+        md.control_type='';
         md.cont_vx=NaN;
         md.cont_vy=NaN;
@@ -185 +184 @@
         md.nsteps=0;
         md.maxiter=[];
-        md.tolx=10^-4;
+        md.tolx=0;
         md.optscal=[];
         md.mincontrolconstraint=0;
-        md.maxcontrolconstraint=2000;
+        md.maxcontrolconstraint=0;
         md.fit=[];
-        md.epsvel=eps;
-        md.meanvel=1000/(365*24*3600); %1000 m/an
+        md.epsvel=0;
+        md.meanvel=0;
 
         %Output parameters
@@ -202 +201 @@
         md.deviatoricstress=NaN;
         md.strainrate=NaN;
-        md.plot=1;
+        md.plot=0;
 
         %debugging
-        md.debug=1;
+        md.debug=0;
         md.element_debug=0;
         md.element_debugid=NaN;
@@ -219 +218 @@
 
         %Parallelisation parameters
-        md.cluster='none';
+        md.cluster='';
         md.np=0;
         md.time=0;
         md.queue='';
         md.exclusive=0;
-        md.scheduler_configuration='local';
-        md.outlog=' ';
-        md.errlog=' ';
+        md.scheduler_configuration='';
+        md.outlog='';
+        md.errlog='';
         md.alloc_cleanup=1;
         md.waitonlock=0;
 
         %mesh2grid
-        md.mesh2grid_parameters={'vel'};
-        md.mesh2grid_interpolation={'node'};
-        md.mesh2grid_filter={'average'};
+        md.mesh2grid_parameters={};
+        md.mesh2grid_interpolation={};
+        md.mesh2grid_filter={};
         md.mesh2grid_cornereast=0;
         md.mesh2grid_cornernorth=0;
-        md.mesh2grid_xposting=1000;
-        md.mesh2grid_yposting=1000;
-        md.mesh2grid_nlines=1000;
-        md.mesh2grid_ncolumns=1000;
-        md.mesh2grid_windowsize=1;
+        md.mesh2grid_xposting=0;
+        md.mesh2grid_yposting=0;
+        md.mesh2grid_nlines=0;
+        md.mesh2grid_ncolumns=0;
+        md.mesh2grid_windowsize=0;
         md.mesh2grid_results=NaN;
         md.dummy=NaN;
@@ -249 +248 @@
         md.mesh_resolution=NaN;
 
-        %Cielo parameters 
-        md.solverstring=' -mat_type aijmumps -ksp_type preonly -pc_type lu -mat_mumps_icntl_14 40 ';
-
-        %Trash, still to organize
+        %Cielo solver string
+        md.solverstring='';
         md.analysis_type='';
 
@@ -264 +261 @@
 
         %qmu
-        md.variables =struct();
-        md.responses =struct();
+        md.variables=struct();
+        md.responses=struct();
         md.qmu_method=struct();
         md.qmu_params=struct();
         md.dakotaresults=struct();
-        md.dakotain     ='';
-        md.dakotaout    ='';
-        md.dakotadat    ='';
-
-        md.npart   =1;
-
-        %Solver options
-        %ice
-        md.solver_type='general';
+        md.dakotain='';
+        md.dakotaout='';
+        md.dakotadat='';
+
+        md.npart=0;
+
+        %Ice solver string
+        md.solver_type='';
+
         %output
         md=class(md,'model');
-                                
+
+        %set default parameters
+        md=setdefaultparameters(md);
+
 case 1
         %If single argument of class model, we have a copy constructor.