Changeset 14735 for issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

Timestamp:

04/24/13 09:47:46 (12 years ago)

Author:

lemorzad

Message:

CHG: improved PDD adding a couple input parameter for the desertification effect

File:

• issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (modified) (4 diffs)

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

@@ -2497 +2497 @@
    IssmDouble monthlytemperatures[NUMVERTICES][12],monthlyprec[NUMVERTICES][12];
    IssmDouble h[NUMVERTICES],s[NUMVERTICES]; // ,b
-   IssmDouble rho_water,rho_ice;
+   IssmDouble rho_water,rho_ice,desfac,s0p;
 
    /*Recover monthly temperatures and precipitation*/
@@ -2524 +2524 @@
   rho_water=matpar->GetRhoFreshwater();
 
+  /*Get desertification effect parameters*/
+  desfac=matpar->GetDesFac();
+  s0p=matpar->GetS0p();
+
    /*measure the surface mass balance*/
    for (int iv = 0; iv < NUMVERTICES; iv++){
-     agd[iv]=PddSurfaceMassBlance(&monthlytemperatures[iv][0], &monthlyprec[iv][0], pdds, pds, signorm, yts, h[iv], s[iv], rho_ice, rho_water);
+     agd[iv]=PddSurfaceMassBlance(&monthlytemperatures[iv][0], &monthlyprec[iv][0], pdds, pds, 
+                                  signorm, yts, h[iv], s[iv], rho_ice, rho_water, desfac, s0p);
+     //printf("mass balance %f \n",agd[iv]);
    }
 
@@ -2656 +2662 @@
 /*FUNCTION Penta::RequestedOutput{{{*/
 void Penta::RequestedOutput(int output_enum,int step,IssmDouble time){
-
         if(IsInput(output_enum)){
                 /*just transfer this input to results, and we are done: */
@@ -3473 +3478 @@
         /*Now get the average SMB over the element*/
         Input* smb_input = inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(smb_input);
+
         smb_input->GetInputAverage(&smb);
         Total_Smb=rho_ice*base*smb;// smb on element in kg s-1