Changeset 20155


Ignore:
Timestamp:
02/13/16 13:30:42 (9 years ago)
Author:
Eric.Larour
Message:

CHG: introducing sealevel in all the analyses.

Location:
issm/trunk-jpl
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp

    r19527 r20155  
    3333        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3434        iomodel->FetchDataToInput(elements,BaseEnum);
     35        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    3536        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    3637        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);

  • issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp

    r19527 r20155  
    9898        iomodel->FetchDataToInput(elements,SurfaceEnum);
    9999        iomodel->FetchDataToInput(elements,BaseEnum);
     100        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    100101        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    101102        iomodel->FetchDataToInput(elements,VxEnum);

  • issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp

    r19527 r20155  
    4141        iomodel->FetchDataToInput(elements,SurfaceEnum);
    4242        iomodel->FetchDataToInput(elements,BaseEnum);
     43        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    4344        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    4445        iomodel->FetchDataToInput(elements,VxEnum);

  • issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

    r20098 r20155  
    137137        iomodel->FetchDataToInput(elements,ThicknessEnum);
    138138        iomodel->FetchDataToInput(elements,SurfaceEnum);
     139        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    139140        iomodel->FetchDataToInput(elements,BaseEnum);
    140141        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);

  • issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

    r18929 r20155  
    7777
    7878        iomodel->FetchDataToInput(elements,SurfaceEnum);
     79        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    7980        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    8081        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);

  • issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp

    r19527 r20155  
    8080
    8181        iomodel->FetchDataToInput(elements,SurfaceEnum);
     82        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    8283        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    8384        iomodel->FetchDataToInput(elements,VxEnum);

  • issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp

    r18930 r20155  
    5858        iomodel->FetchDataToInput(elements,SurfaceEnum);
    5959        iomodel->FetchDataToInput(elements,BaseEnum);
     60        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    6061        if(iomodel->domaintype!=Domain2DhorizontalEnum){
    6162                iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum);

  • issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

    r20124 r20155  
    4242        iomodel->FetchDataToInput(elements,SurfaceEnum);
    4343        iomodel->FetchDataToInput(elements,BaseEnum);
     44        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    4445        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    4546        if(iomodel->domaintype!=Domain2DhorizontalEnum & iomodel->domaintype!=Domain3DsurfaceEnum){

  • issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

    r20123 r20155  
    148148        iomodel->FetchDataToInput(elements,SurfaceEnum);
    149149        iomodel->FetchDataToInput(elements,BaseEnum);
     150        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    150151        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    151152        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);

  • issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp

    r18930 r20155  
    5858        iomodel->FetchDataToInput(elements,SurfaceEnum);
    5959        iomodel->FetchDataToInput(elements,BaseEnum);
     60        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    6061        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    6162        if(iomodel->domaintype!=Domain2DhorizontalEnum){

  • issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp

    r20154 r20155  
    3535        iomodel->FetchDataToInput(elements,MaskLandLevelsetEnum);
    3636        iomodel->FetchDataToInput(elements,SealevelriseDeltathicknessEnum);
     37        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    3738
    3839}/*}}}*/

  • issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

    r19479 r20155  
    754754        iomodel->FetchDataToInput(elements,SurfaceEnum);
    755755        iomodel->FetchDataToInput(elements,BaseEnum);
     756        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    756757        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    757758        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);

  • issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp

    r19527 r20155  
    105105        iomodel->FetchDataToInput(elements,SurfaceEnum);
    106106        iomodel->FetchDataToInput(elements,BaseEnum);
     107        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    107108        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    108109        if(iomodel->domaintype!=Domain2DhorizontalEnum){

  • issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

    r20020 r20155  
    9797        iomodel->FetchDataToInput(elements,SurfaceEnum);
    9898        iomodel->FetchDataToInput(elements,BaseEnum);
     99        iomodel->FetchDataToInput(elements,SealevelEnum,0);
    99100        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    100101        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);

  • issm/trunk-jpl/test/NightlyRun/test2002.m

    r20068 r20155  
    99        %slr loading:  {{{
    1010        md.slr.deltathickness=zeros(md.mesh.numberofvertices,1);
     11        md.slr.sealevel=zeros(md.mesh.numberofvertices,1);
    1112        %antarctica
    1213        pos=find(md.mesh.lat <-80);
    … …  
    6263        md.slr.eustatic=1; md.slr.rigid=0; md.slr.elastic=0;
    6364        md=solve(md,SealevelriseSolutionEnum);
    64         Seustatic=md.results.SealevelriseSolution.SealevelriseS;
     65        Seustatic=md.results.SealevelriseSolution.Sealevel;
    6566       
    6667        %eustatic + rigid run:
    6768        md.slr.eustatic=1; md.slr.rigid=1; md.slr.elastic=0;
    6869        md=solve(md,SealevelriseSolutionEnum);
    69         Srigid=md.results.SealevelriseSolution.SealevelriseS;
     70        Srigid=md.results.SealevelriseSolution.Sealevel;
    7071       
    7172        %eustatic + rigid + elastic run:
    7273        md.slr.eustatic=1; md.slr.rigid=1; md.slr.elastic=1;
    7374        md=solve(md,SealevelriseSolutionEnum);
    74         Selastic=md.results.SealevelriseSolution.SealevelriseS;
     75        Selastic=md.results.SealevelriseSolution.Sealevel;
    7576
    7677
Note: See TracChangeset for help on using the changeset viewer.