Changeset 27279


Ignore:
Timestamp:
09/10/22 09:12:07 (3 years ago)
Author:
vverjans
Message:

CHG: compatibility of basalforcingsbeckmanngoosse with frontalforcingsrignotarma

Location:
issm/trunk-jpl/src/c/analyses
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r27278 r27279  
    8989        /*Get what we need for ocean-induced basal melting*/
    9090        bool isstochastic;
    91         int basalforcing_model;
    92         iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
    93         iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     91   int basalforcing_model;
     92   int melt_parameterization;
     93   iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
     94   iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     95   iomodel->FindConstant(&melt_parameterization,"md.frontalforcings.parameterization");
    9496        switch(basalforcing_model){
    9597                case FloatingMeltRateEnum:
    … …  
    132134            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    133135         }
    134          else{
     136         else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    135137            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
    136138         }

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

    r27278 r27279  
    163163        bool isstochastic;
    164164        int basalforcing_model;
     165        int melt_parameterization;
    165166        iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
    166167        iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     168        iomodel->FindConstant(&melt_parameterization,"md.frontalforcings.parameterization");
    167169        switch(basalforcing_model){
    168170                case FloatingMeltRateEnum:
    … …  
    222224                                iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    223225                        }
    224                         else{
     226                        else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    225227                                iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
    226228                        }

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

    r27278 r27279  
    817817                /*Add basal forcings to compute melt rate*/
    818818                bool isstochastic;
    819                 int basalforcing_model;
    820                 iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
    821                 iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     819           int basalforcing_model;
     820           int melt_parameterization;
     821           iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
     822           iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     823           iomodel->FindConstant(&melt_parameterization,"md.frontalforcings.parameterization");
    822824                switch(basalforcing_model){
    823825                        case FloatingMeltRateEnum:
    … …  
    860862              iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    861863           }
    862            else{
     864           else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    863865              iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
    864866           }

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

    r27278 r27279  
    120120        /*Add basal forcings to compute melt rate*/
    121121        bool isstochastic;
    122         int basalforcing_model;
    123         iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
    124         iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     122   int basalforcing_model;
     123   int melt_parameterization;
     124   iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
     125   iomodel->FindConstant(&isstochastic,"md.stochasticforcing.isstochasticforcing");
     126   iomodel->FindConstant(&melt_parameterization,"md.frontalforcings.parameterization");
    125127        switch(basalforcing_model){
    126128                case FloatingMeltRateEnum:
    … …  
    162164            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    163165         }
    164          else{
     166         else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    165167            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
    166168         }
Note: See TracChangeset for help on using the changeset viewer.