Changeset 8490


Ignore:
Timestamp:
06/03/11 08:48:18 (14 years ago)
Author:
seroussi
Message:

c: routine to compute temperature melting point

Location:
issm/trunk/src/c/objects
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r8487 r8490  
    36853685        double     mixed_layer_capacity,thermal_exchange_velocity;
    36863686        double     rho_ice,rho_water,pressure,dt,scalar_ocean;
    3687         double     meltingpoint,beta,heatcapacity,t_pmp;
     3687        double     heatcapacity,t_pmp;
    36883688        double     xyz_list[NUMVERTICES][3];
    36893689        double     xyz_list_tria[NUMVERTICES2D][3];
    … …  
    37053705        rho_ice=matpar->GetRhoIce();
    37063706        heatcapacity=matpar->GetHeatCapacity();
    3707         beta=matpar->GetBeta();
    3708         meltingpoint=matpar->GetMeltingPoint();
    37093707        this->parameters->FindParam(&dt,DtEnum);
    37103708        Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
    … …  
    37203718
    37213719                pressure_input->GetParameterValue(&pressure,gauss);
    3722                 t_pmp=meltingpoint-beta*pressure;
     3720                t_pmp=matpar->TMeltingPoint(pressure);
    37233721
    37243722                scalar_ocean=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity*(t_pmp)/(heatcapacity*rho_ice);

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r8408 r8490  
    465465        double pressure;
    466466        double temperature;
    467         double beta,t_pmp;
    468         double meltingpoint;
     467        double t_pmp;
    469468        int    new_active;
    470469        int    unstable=0;
    … …  
    487486
    488487        //Recover our data:
    489         meltingpoint=matpar->GetMeltingPoint();
    490         beta=matpar->GetBeta();
    491488        parameters->FindParam(&stabilize_constraints,StabilizeConstraintsEnum);
    492489       
    493490        //Compute pressure melting point
    494         t_pmp=meltingpoint-beta*pressure;
     491        t_pmp=matpar->TMeltingPoint(pressure);
    495492
    496493        //Figure out if temperature is over melting_point, in which case, this penalty needs to be activated.

  • issm/trunk/src/c/objects/Materials/Matpar.cpp

    r7674 r8490  
    385385}
    386386/*}}}1*/
     387/*FUNCTION Matpar::TMeltingPoint {{{1*/
     388double Matpar::TMeltingPoint(double pressure){
     389        return meltingpoint-beta*pressure;
     390}
     391/*}}}1*/

  • issm/trunk/src/c/objects/Materials/Matpar.h

    r8386 r8490  
    7979                double GetGamma();
    8080                double GetKn();
     81                double TMeltingPoint(double pressure);
    8182                /*}}}*/
    8283
Note: See TracChangeset for help on using the changeset viewer.