Changeset 18074

Timestamp:

05/30/14 15:16:19 (11 years ago)

Author:

seroussi

Message:

CHG: separaring grounded and floating melting rates where appropriate

Location:

issm/trunk-jpl/src/c/analyses

Files:

• FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• MasstransportAnalysis.cpp (modified) (1 diff)
• StressbalanceVerticalAnalysis.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

@@ -292 +292 @@
                 if(phi>0) mb=gmb;
                 else mb=fmb;
-                mb=gmb;
 
                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(bed+dt*(mb) + dt*vz)*basis[i];

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -558 +558 @@
                 if(phi>0.) mb=gmb;
                 else mb=fmb;
-                mb=gmb;
 
                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb))*basis[i];

issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp

@@ -324 +324 @@
                 if(phi>0.) basalmeltingvalue=gmb;
                 else basalmeltingvalue=fmb;
-                basalmeltingvalue=gmb;
 
                 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss);