Changeset 14811

Timestamp:

04/30/13 12:23:47 (12 years ago)

Author:

Eric.Larour

Message:

CHG: allow transient forcings for thickness

File:

• issm/trunk-jpl/src/m/classes/geometry.m (modified) (1 diff)

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

@@ -25 +25 @@
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
-
-                        md = checkfield(md,'geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
-                        md = checkfield(md,'geometry.bed'      ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
-                        md = checkfield(md,'geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
-                        if any((obj.thickness-obj.surface+obj.bed)>10^-9),
-                                md = checkmessage(md,['equality thickness=surface-bed violated']);
-                        end 
-                        if solution==TransientSolutionEnum() & md.transient.isgroundingline,
-                                md = checkfield(md,'geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                
+                        if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()),
+                                md = checkfield(md,'geometry.thickness','forcing',1,'NaN',1,'>=',0);
+                        else
+                                md = checkfield(md,'geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                md = checkfield(md,'geometry.bed'      ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                md = checkfield(md,'geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
+                                if any((obj.thickness-obj.surface+obj.bed)>10^-9),
+                                        md = checkmessage(md,['equality thickness=surface-bed violated']);
+                                end 
+                                if solution==TransientSolutionEnum() & md.transient.isgroundingline,
+                                        md = checkfield(md,'geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                end
                         end
                 end % }}}