Index: ../trunk-jpl/src/c/shared/Elements/NyeCO2.cpp =================================================================== --- ../trunk-jpl/src/c/shared/Elements/NyeCO2.cpp (revision 24103) +++ ../trunk-jpl/src/c/shared/Elements/NyeCO2.cpp (revision 24104) @@ -4,15 +4,17 @@ * where rigidigty (in s^(1/n)Pa) is the flow law paramter in the flow law sigma=B*e(1/n) (Nye, p2000). */ -#include "../io/io.h" #include #include "../Numerics/types.h" +#include "../io/io.h" +#include +#include "../Numerics/types.h" IssmDouble NyeCO2(IssmDouble temperature){ /*Coefficients*/ - const IssmPDouble Rg = 8.3144598; /* J mol^-1 K^-1 */ const - IssmPDouble A_const = pow(10.,10.8); /*s^-1 MPa */ const IssmPDouble - Q = 63000.; /*J mol^-1 */ const IssmPDouble n = - 7.; /*Glen's exponent*/ + const IssmPDouble Rg = 8.3144598; /* J mol^-1 K^-1 */ + const IssmPDouble A_const = pow(10.,10.8); /*s^-1 MPa */ + const IssmPDouble Q = 63000.; /*J mol^-1 */ + const IssmPDouble n = 7.; /*Glen's exponent*/ /*Arrhenius Law*/ IssmDouble A = A_const *exp(-Q/(temperature*Rg)); /*s^-1 MPa */ @@ -19,10 +21,8 @@ IssmDouble B = 1e6*pow(A,-1/n); /*s^(1/n) Pa */ /*Beyond-melting-point cases*/ - if((temperature>200.)&&(temperature<220.)) printf("CO2 ICE - POSSIBLE - MELTING. Some temperature values are between 200K and 220K.\n"); - else if(temperature>=220.) _printf0_("CO2 ICE - GUARANTEED MELTING. Some - temperature values are beyond 220K.\n"); + if((temperature>200.)&&(temperature<220.)) _printf0_("CO2 ICE - POSSIBLE MELTING. Some temperature values are between 200K and 220K.\n"); + else if(temperature>=220.) _printf0_("CO2 ICE - GUARANTEED MELTING. Some temperature values are beyond 220K.\n"); /*Return output*/ return B;