Changeset 15396 for issm/trunk/src/m/classes/geometry.m

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/geometry.m (modified) (2 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -26 +26 @@
                 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 % }}}
@@ -39 +43 @@
                         disp(sprintf('   geometry parameters:'));
 
-                        fielddisplay(obj,'surface','surface elevation');
-                        fielddisplay(obj,'thickness','ice thickness');
-                        fielddisplay(obj,'bed','bed elevation');
-                        fielddisplay(obj,'bathymetry','bathymetry elevation');
+                        fielddisplay(obj,'surface','surface elevation [m]');
+                        fielddisplay(obj,'thickness','ice thickness [m]');
+                        fielddisplay(obj,'bed','bed elevation [m]');
+                        fielddisplay(obj,'bathymetry','bathymetry elevation [m]');
                         fielddisplay(obj,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro');
 
                 end % }}}
-                function marshall(obj,fid) % {{{
+                function marshall(obj,md,fid) % {{{
                         WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
-                        WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum());
+                        WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1);
                         WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum());
                         WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum());

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache