Changeset 7083


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/model/geography.m

    r3117 r7083  
    4141elementoniceshelf=double((elementoniceshelf & ~elementonicesheet));
    4242elementonicesheet=double(~elementoniceshelf);
     43%the order here is important. we choose gridoniceshelf as default on the grounding line.
     44gridonicesheet(md.elements(find(elementonicesheet),:))=1;
    4345gridoniceshelf(md.elements(find(elementoniceshelf),:))=1;
    44 gridonicesheet(md.elements(find(elementonicesheet),:))=1;
    4546
    4647%Return:
  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r7024 r7083  
    152152        error(['model not consistent: model ' md.name ' violates the equality thickness=surface-bed!']);
    153153end
     154if md.gl_migration & isnan(md.bathymetry),
     155        error(['model not consistent: model ' md.name ' requesting grounding line migration, buth bathymetry is absent!']);
     156end
     157
    154158%}}}
    155159%RIFTS{{{1
  • issm/trunk/src/m/model/marshall.m

    r6949 r7083  
    3131WriteData(fid,md.z,'Mat','z');
    3232WriteData(fid,md.elements,'Mat','elements');
     33WriteData(fid,md.elementconnectivity,'Mat','elementconnectivity');
    3334WriteData(fid,md.elements_type,'Mat','elements_type');
    3435WriteData(fid,md.vertices_type,'Mat','vertices_type');
     
    161162WriteData(fid,md.isstokes,'Integer','isstokes');
    162163
     164%grounding line migration:
     165WriteData(fid,md.gl_migration,'Integer','grounding_line_migration');
     166if(md.gl_migration),
     167        WriteData(fid,md.bathymetry,'Mat','bathymetry');
     168end
     169
    163170%Rifts
    164171WriteData(fid,md.riftinfo,'Mat','riftinfo');
  • issm/trunk/src/m/model/tres.m

    r7030 r7083  
    6161                        results2(count).time=md.results.Transient2DSolution(i).time;
    6262                        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
    6366                        count=count+1;
    6467                end
Note: See TracChangeset for help on using the changeset viewer.