Changeset 18494

Timestamp:

09/10/14 13:29:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not check seaice if this is not the solution

Location:

issm/trunk-jpl/src/m/classes

Files:

• matseaice.m (modified) (5 diffs)
• seaice.m (modified) (1 diff)

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

@@ -6 +6 @@
 classdef matseaice
         properties (SetAccess=public) 
+                rho_ice                = 0.;
                 poisson                = 0.;
                 young_modulus          = 0.;
@@ -36 +37 @@
                 function obj = setdefaultparameters(obj) % {{{
 
+                        %Ice density
+                        obj.rho_ice = 917.; %kg/m^3
+
                         %poisson modulus
                         obj.poisson=0.3;
@@ -59 +63 @@
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
+                        md = checkfield(md,'fieldname','materials.rho_ice','NaN',1,'>',0,'numel',1);
                         md = checkfield(md,'fieldname','materials.poisson','NaN',1,'>',0,'<',.5,'numel',1);
                         md = checkfield(md,'fieldname','materials.young_modulus','NaN',1,'>',0,'numel',1);
@@ -71 +76 @@
                         disp(sprintf('   Sea Ice Material:'));
 
+                        fielddisplay(obj,'rho_ice','ice density [kg/m^3]');
                         fielddisplay(obj,'poisson','poisson ratio for undamaged ice [no unit]');
                         fielddisplay(obj,'young_modulus','Young modulus for undamaged ice [Pa]');
@@ -82 +88 @@
                 function marshall(obj,md,fid) % {{{
                         WriteData(fid,'enum',MaterialsEnum(),'data',MatseaiceEnum(),'format','Integer');
+                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double');
                         WriteData(fid,'object',obj,'class','materials','fieldname','poisson','format','Double');
                         WriteData(fid,'object',obj,'class','materials','fieldname','young_modulus','format','Double');

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

@@ -21 +21 @@
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
+                        if solution~=SeaiceSolutionEnum(), return; end
                         md = checkfield(md,'fieldname','seaice.thickness','size',[md.mesh.numberofelements 1],'NaN',1,'>=',0);
                         md = checkfield(md,'fieldname','seaice.concentration','size',[md.mesh.numberofelements 1],'NaN',1,'>=',0);