Changeset 7083

Timestamp:

01/14/11 08:12:17 (14 years ago)

Author:

Eric.Larour

Message:

geography: a node can only be on an ice shelf, or (exclusive) on an ice sheet.
tres: added transfer of info for ElementOnIceShelf during a transient.
marshall: new grounding line infomration.
ismodelselfconsistent: check bathymetry is there when grounding line migration requested.

Location:

issm/trunk/src/m/model

Files:

• geography.m (modified) (1 diff)
• ismodelselfconsistent.m (modified) (1 diff)
• marshall.m (modified) (2 diffs)
• tres.m (modified) (1 diff)

issm/trunk/src/m/model/geography.m

@@ -41 +41 @@
 elementoniceshelf=double((elementoniceshelf & ~elementonicesheet));
 elementonicesheet=double(~elementoniceshelf);
+%the order here is important. we choose gridoniceshelf as default on the grounding line.
+gridonicesheet(md.elements(find(elementonicesheet),:))=1;
 gridoniceshelf(md.elements(find(elementoniceshelf),:))=1;
-gridonicesheet(md.elements(find(elementonicesheet),:))=1;
 
 %Return: 

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

@@ -152 +152 @@
         error(['model not consistent: model ' md.name ' violates the equality thickness=surface-bed!']);
 end
+if md.gl_migration & isnan(md.bathymetry),
+        error(['model not consistent: model ' md.name ' requesting grounding line migration, buth bathymetry is absent!']);
+end
+
 %}}}
 %RIFTS{{{1

issm/trunk/src/m/model/marshall.m

@@ -31 +31 @@
 WriteData(fid,md.z,'Mat','z');
 WriteData(fid,md.elements,'Mat','elements');
+WriteData(fid,md.elementconnectivity,'Mat','elementconnectivity');
 WriteData(fid,md.elements_type,'Mat','elements_type');
 WriteData(fid,md.vertices_type,'Mat','vertices_type');
@@ -161 +162 @@
 WriteData(fid,md.isstokes,'Integer','isstokes');
 
+%grounding line migration: 
+WriteData(fid,md.gl_migration,'Integer','grounding_line_migration');
+if(md.gl_migration),
+        WriteData(fid,md.bathymetry,'Mat','bathymetry');
+end
+
 %Rifts
 WriteData(fid,md.riftinfo,'Mat','riftinfo');

issm/trunk/src/m/model/tres.m

@@ -61 +61 @@
                         results2(count).time=md.results.Transient2DSolution(i).time;
                         results2(count).step=md.results.Transient2DSolution(i).step;
+                        if md.gl_migration,
+                                results2(count).ElementOnIceShelf=PatchToVec(md.results.Transient2DSolution(i).ElementOnIceShelf);
+                        end
                         count=count+1;
                 end