Changeset 9075 for issm/trunk/src/m/model/ismodelselfconsistent.m

Timestamp:

07/19/11 16:28:47 (14 years ago)

Author:

Mathieu Morlighem

Message:

Simplified spcthickness (use new NaN scheme)

File:

• issm/trunk/src/m/model/ismodelselfconsistent.m (modified) (4 diffs)

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -224 +224 @@
         if any(md.thickness<=0),
                 pos=find(md.thickness<=0);
-                if any(find(md.spcthickness(pos,1)==0)),
+                if any(isnan(md.spcthickness(pos))),
                         message(['model not consistent: model ' md.name ' has some nodes with 0 thickness']);
                 end
@@ -369 +369 @@
                         if any(md.thickness<=0),
                                 pos=find(md.thickness<=0);
-                                if any(find(md.spcthickness(pos,1)==0)),
+                                if any(isnan(md.spcthickness(pos))),
                                         message(['model not consistent: model ' md.name ' has some nodes with 0 thickness']);
                                 end
@@ -458 +458 @@
                         checksize(md,fields,[md.numberofnodes 1]);
                         checknan(md,fields);
-
-                        %CHECK THAT WE ARE NOT FULLY CONSTRAINED
-                        if (md.dim==2),
-                                if isnan(find(~md.spcthickness(:,1))),
-                                        message(['model not consistent: model ' md.name ' is totally constrained for prognostic, no need to solve!']);
-                                end
-                        end
                         %}}}
                 case HydrologyAnalysisEnum,
@@ -560 +553 @@
                         checksize(md,fields,[md.numberofnodes 1]);
                         checknan(md,fields);
-
-                        %SPC                             
-                        %       if ~md.prognostic_DG,
-                        %               if any(md.spcthickness(find(md.nodeonboundary))~=1),             
-                        %                       message(['model not consistent: model ' md.name ' should have all the nodes on boundary constrained in field spcthickness']);                    
-                        %               end 
-                        %       end
 
                         %Triangle with zero velocity