Changeset 18951


Ignore:
Timestamp:
12/05/14 13:42:17 (10 years ago)
Author:
lemorzad
Message:

updating GetRhoIce in pdd

Location:
issm/trunk-jpl/src/c/classes/Elements
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r18950 r18951  
    20192019
    20202020   /*Get material parameters :*/
    2021    rho_ice=matpar->GetRhoIce();
    2022    rho_water=matpar->GetRhoFreshwater();
     2021   rho_water=matpar->GetMaterialParameter(MaterialsRhoSeawaterEnum);
     2022   rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
     2023   //rho_ice=matpar->GetRhoIce();
     2024   //rho_water=matpar->GetRhoFreshwater();
    20232025
    20242026   sconv=(rho_water/rho_ice)/12.; //to convert monbthly prec in m of ice equivalent per month

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

    r18950 r18951  
    22222222   
    22232223   /*Get material parameters :*/
    2224    rho_ice=matpar->GetRhoIce();
    2225    rho_water=matpar->GetRhoFreshwater();
     2224   rho_water=matpar->GetMaterialParameter(MaterialsRhoSeawaterEnum);
     2225   rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
     2226   //rho_ice=matpar->GetRhoIce();
     2227   //rho_water=matpar->GetRhoFreshwater();
    22262228
    22272229   sconv=(rho_water/rho_ice)/12.; //to convert monbthly prec in m of ice equivalent per month
Note: See TracChangeset for help on using the changeset viewer.