Changeset 9751

Timestamp:

09/09/11 17:04:04 (14 years ago)

Author:

Mathieu Morlighem

Message:

some more consistency checks

Location:

issm/trunk/src/m

Files:

• classes/balancethickness.m (modified) (1 diff)
• classes/clusters/castor.m (modified) (1 diff)
• classes/clusters/cosmos.m (modified) (1 diff)
• classes/clusters/gemini.m (modified) (1 diff)
• classes/clusters/generic.m (modified) (1 diff)
• classes/clusters/none.m (modified) (1 diff)
• classes/clusters/pfe.m (modified) (3 diffs)
• classes/clusters/pollux.m (modified) (1 diff)
• classes/groundingline.m (modified) (1 diff)
• classes/materials.m (modified) (1 diff)
• classes/mesh.m (modified) (1 diff)
• classes/prognostic.m (modified) (1 diff)
• classes/rifts.m (modified) (1 diff)
• classes/thermal.m (modified) (1 diff)
• classes/timestepping.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/m/classes/balancethickness.m

@@ -40 +40 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
-
+                        if ~ismember(md.balancethickness.stabilization,[0 1 3]),
+                                checkmessage('model not consistent: balancethickness.stabilization should be a scalar (0 or 1 or 3)');
+                        end
                 end % }}}
         end

issm/trunk/src/m/classes/clusters/castor.m

@@ -46 +46 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
 
                          available_queues={'shortc','longc'};

issm/trunk/src/m/classes/clusters/cosmos.m

@@ -46 +46 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
 
                          available_queues={'debug','shortq','longq'};

issm/trunk/src/m/classes/clusters/gemini.m

@@ -46 +46 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
 
                          available_queues={'debug','shortg','longg'};

issm/trunk/src/m/classes/clusters/generic.m

@@ -60 +60 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
                          if cluster.np<1
-                                 error(['number of processors should be at least 1']);
+                                 checkmessage(['number of processors should be at least 1']);
                          end
                          if isnan(cluster.np),
-                                 error('number of processors should not be NaN!');
+                                 checkessage('number of processors should not be NaN!');
                          end
                  end

issm/trunk/src/m/classes/clusters/none.m

@@ -30 +30 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
                  end
                  %}}}

issm/trunk/src/m/classes/clusters/pfe.m

@@ -65 +65 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
 
                          available_queues={'long','debug'};
@@ -77 +77 @@
                                  if cluster.hyperthreading,
                                          if ((cluster.cpuspernode>16 ) | (cluster.cpuspernode<1)),
-                                                 error('IsConsistent error message: cpuspernode should be between 1 and 16 for ''neh'' and ''har'' processors in hyperthreading mode');
+                                                 checkmessage('cpuspernode should be between 1 and 16 for ''neh'' and ''har'' processors in hyperthreading mode');
                                          end
                                  else
                                          if ((cluster.cpuspernode>8 ) | (cluster.cpuspernode<1)),
-                                                 error('IsConsistent error message: cpuspernode should be between 1 and 8 for ''neh'' and ''har'' processors');
+                                                 checkmessage('cpuspernode should be between 1 and 8 for ''neh'' and ''har'' processors');
                                          end
                                  end
@@ -87 +87 @@
                                  if cluster.hyperthreading,
                                          if ((cluster.cpuspernode>24 ) | (cluster.cpuspernode<1)),
-                                                 error('IsConsistent error message: cpuspernode should be between 1 and 24 for ''wes'' processors in hyperthreading mode');
+                                                 checkmessage('cpuspernode should be between 1 and 24 for ''wes'' processors in hyperthreading mode');
                                          end
                                  else
                                          if ((cluster.cpuspernode>12 ) | (cluster.cpuspernode<1)),
-                                                 error('IsConsistent error message: cpuspernode should be between 1 and 12 for ''wes'' processors');
+                                                 checkmessage('cpuspernode should be between 1 and 12 for ''wes'' processors');
                                          end
                                  end
                          else
-                                 error('IsConsistent error message: unknown processor type, should be ''neh'',''wes'' or ''har''');
+                                 checkmessage('unknown processor type, should be ''neh'',''wes'' or ''har''');
                          end
 
                          %Miscelaneous
-                         if isempty(cluster.login), error('IsConsistent error message: login empty'); end
-                         if isempty(cluster.codepath), error('IsConsistent error message: codepath empty'); end
-                         if isempty(cluster.executionpath), error('IsConsistent error message: executionpath empty'); end
+                         if isempty(cluster.login), checkmessage('login empty'); end
+                         if isempty(cluster.codepath), checkmessage('codepath empty'); end
+                         if isempty(cluster.executionpath), checkmessage('executionpath empty'); end
 
                  end

issm/trunk/src/m/classes/clusters/pollux.m

@@ -46 +46 @@
                  end
                  %}}}
-                 function IsConsistent(cluster) % {{{1
+                 function checkconsistency(cluster,md) % {{{1
 
                          available_queues={'shortp','longp'};

issm/trunk/src/m/classes/groundingline.m

@@ -44 +44 @@
                 function checkconsistency(obj,md) % {{{
 
+                        if ~ismember({obj.migration},{'None' 'AgressiveMigration' 'SoftMigration'}),
+                                checkmessage(['groundingline.migration field should be ''None'' ''AgressiveMigration'' or ''SoftMigration''']);
+                        end
+                        if ~strcmp(obj.migration,'None'),
+                                if (md.mesh.dimension==3 | strcmpi(md.cluster.name,'none')),
+                                        checkmessage(['requesting grounding line migration, but grounding line module only implemented for 2d models and parallel runs!']);
+                                end
+                                if isnan(md.geometry.bathymetry),
+                                        checkmessage(['requesting grounding line migration, but bathymetry is absent!']);
+                                end
+                                pos=find(md.mask.vertexongroundedice); 
+                                if any(md.geometry.bed(pos)-md.geometry.bathymetry(pos)),
+                                        checkmessage(['bathymetry not equal to bed on grounded ice !']);
+                                end
+                                pos=find(md.mask.vertexonfloatingice); 
+                                if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>tolerance),
+                                        checkmessage(['bathymetry superior to bed on floating ice !']);
+                                end
+                        end
+
                 end % }}}
         end

issm/trunk/src/m/classes/materials.m

@@ -85 +85 @@
                         fields={'rheology_B'};
                         checksize(md,'materials',fields,[md.mesh.numberofvertices 1]);
+
+                        if ~ismember({md.materials.rheology_law},{'None' 'Paterson' 'Arrhenius'}),
+                                checkmessage(['model not consistent: model ' md.miscellaneous.name ' rheology_law field should be ''none'' ''paterson'' or ''arrhenius''']);
+                        end
                 end % }}}
                 function disp(obj) % {{{

issm/trunk/src/m/classes/mesh.m

@@ -105 +105 @@
                         end
 
+
+                        if (md.mesh.dimension==2),
+                                if md.mesh.average_vertex_connectivity<9, 
+                                        checkmessage('model not consistent: connectivity should be at least 9 for 2d models');
+                                end
+                        end
+                        if md.mesh.dimension==3,
+                                if md.mesh.average_vertex_connectivity<24, 
+                                        checkmessage('model not consistent: connectivity should be at least 24 for 3d models');
+                                end
+                        end
+
                         %Solution specific checks
                         switch(md.private.solution),

issm/trunk/src/m/classes/prognostic.m

@@ -47 +47 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
+                        if ~ismember(obj.stabilization,[0 1 3]),
+                                checkmessage('prognostic.stabilization should be a scalar (0 or 1 or 3)');
+                        end
 
+                        if ~ismember(md.prognostic.hydrostatic_adjustment,{'Absolute' 'Incremental'}),
+                                checkmessage(['model not consistent: model ' md.miscellaneous.name ' prognostic.hydrostatic_adjustment field should be AbsoluteEnum or IncrementalEnum']);
+                        end
                 end % }}}
                 function disp(obj) % {{{

issm/trunk/src/m/classes/rifts.m

@@ -36 +36 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
-
+                        if obj.numrifts,
+                                if ~(md.mesh.dimension==2),
+                                        checkmessage(['model not consistent: models with rifts are only supported in 2d for now!']);
+                                end
+                                if ~isstruct(obj.riftstruct),
+                                        checkmessage(['rifts.riftstruct should be a structure!']);
+                                end
+                                if ~isempty(find(md.mesh.segmentmarkers>=2)),
+                                        %We have segments with rift markers, but no rift structure!
+                                        checkmessage(['model should be processed for rifts (run meshprocessrifts)!']);
+                                end
+                                %Check that rifts are filled with proper material
+                                checkvalues(md,{'rifts.riftstruct.fill'},[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
+                        else
+                                if ~isnans(obj.riftstruct),
+                                        checkmessage(['riftstruct shoud be NaN since obj.numrifts is 0!']);
+                                end
+                        end
                 end % }}}
         end

issm/trunk/src/m/classes/thermal.m

@@ -51 +51 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
+                        if ~ismember(obj.stabilization,[0 1 2]),
+                                checkmessage('thermal.stabilization should be a scalar (0 or 1 or 2)');
+                        end
 
                 end % }}}

issm/trunk/src/m/classes/timestepping.m

@@ -47 +47 @@
                 end % }}}
                 function checkconsistency(obj,md) % {{{
-
+                        if ~ismember(md.timestepping.time_adapt,[0 1]),
+                                checkmessage(['model not consistent: model ' md.miscellaneous.name ' time_adapt field should be 0 or 1']);
+                        end
                 end % }}}
         end

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

@@ -12 +12 @@
 for i=1:length(fields),
         field=fields{i};
-        if ismember(field,{'cluster' 'results' 'debug' 'radaroverlay'}),
+        if ismember(field,{'results' 'debug' 'radaroverlay'}),
                 continue;
         end