Changeset 24733


Ignore:
Timestamp:
04/23/20 11:30:43 (5 years ago)
Author:
Eric.Larour
Message:

CHG: fixed error where we were picking up fresh water instead of sea water in the SLR solver.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r24658 r24733  
    55345534
    55355535                /*recover material parameters: */
    5536                 rho_water=FindParam(MaterialsRhoFreshwaterEnum);
     5536                rho_water=FindParam(MaterialsRhoSeawaterEnum);
    55375537
    55385538                /*From Sg_old, recover water sea level rise:*/
    … …  
    56425642        /*recover material parameters: */
    56435643        rho_ice=FindParam(MaterialsRhoIceEnum);
    5644         rho_water=FindParam(MaterialsRhoFreshwaterEnum);
     5644        rho_water=FindParam(MaterialsRhoSeawaterEnum);
    56455645        rho_earth=FindParam(MaterialsEarthDensityEnum);
    56465646
    … …  
    58255825
    58265826        /*recover material parameters: */
    5827         rho_water=FindParam(MaterialsRhoFreshwaterEnum);
     5827        rho_water=FindParam(MaterialsRhoSeawaterEnum);
    58285828        rho_earth=FindParam(MaterialsEarthDensityEnum);
    58295829
    … …  
    59895989
    59905990        /*recover material parameters: */
    5991         rho_water=FindParam(MaterialsRhoFreshwaterEnum);
     5991        rho_water=FindParam(MaterialsRhoSeawaterEnum);
    59925992        rho_earth=FindParam(MaterialsEarthDensityEnum);
    59935993
    … …  
    61436143        /*recover material parameters: */
    61446144        rho_ice=FindParam(MaterialsRhoIceEnum);
    6145         rho_water=FindParam(MaterialsRhoFreshwaterEnum);
     6145        rho_water=FindParam(MaterialsRhoSeawaterEnum);
    61466146        rho_earth=FindParam(MaterialsEarthDensityEnum);
    61476147
Note: See TracChangeset for help on using the changeset viewer.