Changeset 13131

Timestamp:

08/22/12 15:38:24 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: tria->material is now an object-oriented that can either be Matice or Matdamageice

Location:

issm/trunk-jpl/src/m/classes

Files:

• initialization.m (modified) (1 diff)
• matice.m (moved) (moved from issm/trunk-jpl/src/m/classes/materials.m ) (4 diffs)
• model/model.m (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/initialization.m

@@ -82 +82 @@
                         WriteData(fid,'data',obj.pressure,'format','DoubleMat','mattype',1,'enum',PressureEnum);
                         WriteData(fid,'data',obj.temperature,'format','DoubleMat','mattype',1,'enum',TemperatureEnum);
-                        WriteData(fid,'data',obj.surfacetemp,'format','DoubleMat','mattype',1,'enum',TemperatureSurfaceEnum);
-                        WriteData(fid,'data',obj.basaltemp,'format','DoubleMat','mattype',1,'enum',TemperatureBasalEnum);
                         WriteData(fid,'data',obj.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum);
                         WriteData(fid,'data',obj.waterfraction,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum);

issm/trunk-jpl/src/m/classes/matice.m

@@ -1 @@
-%MATERIALS class definition
+%MATICE class definition
 %
 %   Usage:
-%      materials=materials();
+%      matice=matice();
 
-classdef materials
+classdef matice
         properties (SetAccess=public) 
                 rho_ice                    = 0.;
@@ -19 +19 @@
                 rheology_B   = NaN;
                 rheology_n   = NaN;
-                rheology_Z   = NaN;
                 rheology_law = '';
         end
         methods
-                function obj = materials(varargin) % {{{
+                function obj = matice(varargin) % {{{
                         switch nargin
                                 case 0
@@ -77 +76 @@
                         md = checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
-                        md = checkfield(md,'materials.rheology_Z','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius'});
                 end % }}}
@@ -96 +94 @@
                         fielddisplay(obj,'rheology_B','flow law parameter [Pa/s^(1/n)]');
                         fielddisplay(obj,'rheology_n','Glen''s flow law exponent');
-                        fielddisplay(obj,'rheology_Z','rheology multiplier');
                         fielddisplay(obj,'rheology_law','law for the temperature dependance of the rheology: ''None'', ''Paterson'' or ''Arrhenius''');
                 end % }}}
                 function marshall(obj,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','rho_ice','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','rho_water','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','rho_freshwater','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','mu_water','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','heatcapacity','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','latentheat','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','thermalconductivity','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','meltingpoint','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','beta','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','mixed_layer_capacity','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','thermal_exchange_velocity','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','rheology_B','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','rheology_n','format','DoubleMat','mattype',2);
-                        WriteData(fid,'object',obj,'fieldname','rheology_Z','format','DoubleMat','mattype',1);
+                        WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_water','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_freshwater','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','mu_water','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','heatcapacity','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','latentheat','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','thermalconductivity','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','meltingpoint','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','beta','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','mixed_layer_capacity','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','thermal_exchange_velocity','format','Double');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2);
                         WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer');
                 end % }}}

issm/trunk-jpl/src/m/classes/model/model.m

@@ -168 +168 @@
                          md.materials.rheology_B=DepthAverage(md,md.materials.rheology_B);
                          md.materials.rheology_n=project2d(md,md.materials.rheology_n,1);
-                         md.materials.rheology_Z=DepthAverage(md,md.materials.rheology_Z);
+                         if isa(md.materials,'matdamageice')
+                                 md.materials.rheology_Z=DepthAverage(md,md.materials.rheology_Z);
+                         end
 
                          %special for thermal modeling:
@@ -717 +719 @@
                          md.materials.rheology_B=project3d(md,'vector',md.materials.rheology_B,'type','node');
                          md.materials.rheology_n=project3d(md,'vector',md.materials.rheology_n,'type','element');
-                         md.materials.rheology_Z=project3d(md,'vector',md.materials.rheology_Z,'type','node');
+                         if isa(md.materials,'matdamageice')
+                                 md.materials.rheology_Z=project3d(md,'vector',md.materials.rheology_Z,'type','node');
+                         end
 
                          %parameters
@@ -831 +835 @@
                          if isfield(structmd,'B'), md.materials.rheology_B=structmd.B; end
                          if isfield(structmd,'n'), md.materials.rheology_n=structmd.n; end
-                         if isfield(structmd,'Z'), md.materials.rheology_Z=structmd.Z; end
                          if isfield(structmd,'rheology_B'), md.materials.rheology_B=structmd.rheology_B; end
                          if isfield(structmd,'rheology_n'), md.materials.rheology_n=structmd.rheology_n; end
-                         if isfield(structmd,'rheology_Z'), md.materials.rheology_Z=structmd.rheology_Z; end
                          if isfield(structmd,'elementoniceshelf'), md.mask.elementonfloatingice=structmd.elementoniceshelf; end
                          if isfield(structmd,'elementonicesheet'), md.mask.elementongroundedice=structmd.elementonicesheet; end
@@ -1044 +1046 @@
                          md.timestepping     = timestepping();
                          md.groundingline    = groundingline();
-                         md.materials        = materials();
+                         md.materials        = matice();
                          md.flowequation     = flowequation();
                          md.debug            = debug();