Changeset 9221

Timestamp:

08/09/11 13:42:40 (14 years ago)

Author:

Mathieu Morlighem

Message:

cosmetics

Location:

issm/trunk/src/m/model

Files:

• ismodelselfconsistent.m (modified) (2 diffs)
• loadresultsfromdisk.m (modified) (1 diff)
• parseresultsfromdisk.m (modified) (1 diff)

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

@@ -371 +371 @@
                         end
 
-                        %DIRICHLET IF THICKNESS <= 0
-                        %Check the size of spcthickness 
-                        fields={'spcthickness'};
-                        checksize(md,fields,[md.numberofnodes 1]);
-                        if any(md.thickness<=0),
-                                pos=find(md.thickness<=0);
-                                if any(isnan(md.spcthickness(pos))),
-                                        message(['model not consistent: model ' md.name ' has some nodes with 0 thickness']);
-                                end
-                        end
-
                         %ROTATED SPC
                         %CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES
@@ -470 +459 @@
                         fields={'surface_mass_balance'};
                         checkforcing(md,fields);
+
+                        %DIRICHLET
+                        fields={'spcthickness'};
+                        checkforcing(md,fields);
+
+                        %DIRICHLET IF THICKNESS <= 0
+                        %Check the size of spcthickness 
+                        if any(md.thickness<=0),
+                                pos=find(md.thickness<=0);
+                                if any(isnan(md.spcthickness(pos))),
+                                        message(['model not consistent: model ' md.name ' has some nodes with 0 thickness']);
+                                end
+                        end
+
                         %}}}
                 case HydrologyAnalysisEnum,

issm/trunk/src/m/model/loadresultsfromdisk.m

@@ -25 +25 @@
         md.solution_type=structure(1).SolutionType;
 
-        %Check result is consistent, only if it exists
-        %disp(sprintf('%s\n','checking result consistency'));
-        %if ~isresultconsistent(md,structure(1).SolutionType), After many uses, found out its useless.
-        %       %it would be very cruel to use an error, it would kill the computed results (although they are not consistent...)
-        %       disp('!! results not consistent correct the model !!') 
-        %end
-
 %post processes qmu results if necessary
 else

issm/trunk/src/m/model/parseresultsfromdisk.m

@@ -4 +4 @@
 %   Usage:
 %      results=parseresultsfromdisk(filename,iosplit)
-
-
 
 if iosplit,