Changeset 20081

Timestamp:

02/04/16 13:45:31 (9 years ago)

Author:

seroussi

Message:

BUG: fixed last problem with plume model

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1597 +1597 @@
         a=(bottomplumedepth-topplumedepth)/2.;
         e=pow(a*a-c*c,1./2.)/a;
-        A0=(1-e*e)/(e*e*e)*(1/2*log((1+e)/(1-e))-e);
-        middleplumedepth=-topplumedepth-crustthickness-a;
+        A0=(1-pow(e,2.))/pow(e,3.)*(1./2.*log((1+e)/(1-e))-e);
         for(int i=0;i<numvertices;i++){
                 y=xyz_list[i*3+0]-plumex;
@@ -1607 +1606 @@
                 eprime=pow((a*a-plumeradius*plumeradius)/(a*a+lambda),1./2.);
                 Alambda=(1.-e*e)/(e*e*e)*(1./2.*log((1.+eprime)/(1.-eprime))-eprime);
-                dt=dtbg-(nusselt-1.)/(1.+A0*(nusselt-1.))*(Alambda*dtbg+middleplumedepth*dtbg*dAlambda);
+                dt=dtbg-(nusselt-1.)/(1.+A0*(nusselt-1.))*(Alambda*dtbg+x*dtbg*dAlambda);
                 plumeheat=mantleconductivity*dt;
                 crustheat=uppercrustheat*uppercrustthickness+lowercrustheat*(crustthickness-uppercrustthickness);