Changeset 7083
- Timestamp:
- 01/14/11 08:12:17 (14 years ago)
- Location:
- issm/trunk/src/m/model
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/model/geography.m
r3117 r7083 41 41 elementoniceshelf=double((elementoniceshelf & ~elementonicesheet)); 42 42 elementonicesheet=double(~elementoniceshelf); 43 %the order here is important. we choose gridoniceshelf as default on the grounding line. 44 gridonicesheet(md.elements(find(elementonicesheet),:))=1; 43 45 gridoniceshelf(md.elements(find(elementoniceshelf),:))=1; 44 gridonicesheet(md.elements(find(elementonicesheet),:))=1;45 46 46 47 %Return: -
issm/trunk/src/m/model/ismodelselfconsistent.m
r7024 r7083 152 152 error(['model not consistent: model ' md.name ' violates the equality thickness=surface-bed!']); 153 153 end 154 if md.gl_migration & isnan(md.bathymetry), 155 error(['model not consistent: model ' md.name ' requesting grounding line migration, buth bathymetry is absent!']); 156 end 157 154 158 %}}} 155 159 %RIFTS{{{1 -
issm/trunk/src/m/model/marshall.m
r6949 r7083 31 31 WriteData(fid,md.z,'Mat','z'); 32 32 WriteData(fid,md.elements,'Mat','elements'); 33 WriteData(fid,md.elementconnectivity,'Mat','elementconnectivity'); 33 34 WriteData(fid,md.elements_type,'Mat','elements_type'); 34 35 WriteData(fid,md.vertices_type,'Mat','vertices_type'); … … 161 162 WriteData(fid,md.isstokes,'Integer','isstokes'); 162 163 164 %grounding line migration: 165 WriteData(fid,md.gl_migration,'Integer','grounding_line_migration'); 166 if(md.gl_migration), 167 WriteData(fid,md.bathymetry,'Mat','bathymetry'); 168 end 169 163 170 %Rifts 164 171 WriteData(fid,md.riftinfo,'Mat','riftinfo'); -
issm/trunk/src/m/model/tres.m
r7030 r7083 61 61 results2(count).time=md.results.Transient2DSolution(i).time; 62 62 results2(count).step=md.results.Transient2DSolution(i).step; 63 if md.gl_migration, 64 results2(count).ElementOnIceShelf=PatchToVec(md.results.Transient2DSolution(i).ElementOnIceShelf); 65 end 63 66 count=count+1; 64 67 end
Note:
See TracChangeset
for help on using the changeset viewer.