Changeset 19090

Timestamp:

02/04/15 15:04:52 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: removed some remaining seaice stuff

Location:

issm/trunk-jpl/src/m

Files:

• classes/geometry.m (modified) (1 diff)
• classes/mask.m (modified) (2 diffs)
• classes/stressbalance.m (modified) (1 diff)
• consistency/ismodelselfconsistent.m (modified) (1 diff)

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

@@ -64 +64 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        if (solution==SeaiceSolutionEnum()),
-                                return;
-                        end
-
                         if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()),
                                 md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0);

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

@@ -44 +44 @@
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
-                        if (solution==SeaiceSolutionEnum()),
-                                return;
-                        end
 
                         md = checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]);
@@ -72 +69 @@
                         WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
 
-                        if(md.private.solution==SeaiceSolutionEnum()),
-                                return;
-                        end
-
                         % get mask of vertices of elements with ice
                         isice=md.mask.ice_levelset<=0.;

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

@@ -220 +220 @@
                         WriteData(fid,'object',self,'class','stressbalance','fieldname','vertex_pairing','format','DoubleMat','mattype',3);
 
-                        if md.private.solution==SeaiceSolutionEnum,
-                                return;
-                        end
-
                         yts=365.0*24.0*3600.0;
 

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -91 +91 @@
                 analyses=[DamageEvolutionAnalysisEnum()];
 
-        case SeaiceSolutionEnum(),
-                analyses=[SeaiceAnalysisEnum()];
-
         otherwise
                 error('%s%s%s',' solution type: ',EnumToString(solutiontype),' not supported yet!');