Changeset 26510

Timestamp:

10/27/21 12:37:06 (3 years ago)

Author:

aleahsommers

Message:

CHG: took out experimental diffusion term for now

File:

• issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp (modified) (3 diffs)

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

@@ -395 +395 @@
         //           )*basis[i];
 
-                 /* With weighted creep term*/
+                 /* With weighted creep term */
                   for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*
                    (
@@ -404 +404 @@
                     +ieb
                     +storage*head_old/dt
-                    +1.e-5*(dgapxx+dgapyy)
                     )*basis[i];
+
+                /* Test with experimental diffusivity term*/
+//                   for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*
+ //                   (
+  //                   meltrate*(1/rho_water-1/rho_ice)
+   //                  +A*pow(fabs(pressure_ice - pressure_water),n-1)*(pressure_ice + rho_water*g*bed)*gap
+    //                 +(n-1)*A*pow(fabs(pressure_ice - pressure_water),n-1)*(rho_water*g*head)*gap
+     //                -beta*sqrt(vx*vx+vy*vy)
+      //               +ieb
+       //              +storage*head_old/dt
+        //             +0.e-5*(dgapxx+dgapyy)
+         //            )*basis[i];
+
 
         
@@ -649 +661 @@
                 _assert_(meltrate>0.);
 
-//              newgap += gauss->weight*Jdet*(gap+dt*(
-//                                      meltrate/rho_ice
-//                                      -A*pow(fabs(pressure_ice-pressure_water),n-1)*(pressure_ice-pressure_water)*gap
-//                                      +beta*sqrt(vx*vx+vy*vy)
-//                                      ));
-
-                /* TEST with gap height "diffusivity" for melting walls - not yet completed*/
-                newgap += gauss->weight*Jdet*(gap+dt*(
-                                         meltrate/rho_ice
-                                         -A*pow(fabs(pressure_ice-pressure_water),n-1)*(pressure_ice-pressure_water)*lc
-                                         +beta*sqrt(vx*vx+vy*vy)
-                                         +1.e-5*(dgapxx+dgapyy))
-                                         );
+                newgap += gauss->weight*Jdet*(gap+dt*(
+                                        meltrate/rho_ice
+                                        -A*pow(fabs(pressure_ice-pressure_water),n-1)*(pressure_ice-pressure_water)*gap
+                                        +beta*sqrt(vx*vx+vy*vy)
+                                        ));
+
+                /* TEST with experimental gap height "diffusivity" for melting walls */
+//                newgap += gauss->weight*Jdet*(gap+dt*(
+ //                                        meltrate/rho_ice
+  //                                       -A*pow(fabs(pressure_ice-pressure_water),n-1)*(pressure_ice-pressure_water)*lc
+   //                                      +beta*sqrt(vx*vx+vy*vy)
+//                                       +0.e-5*(dgapxx+dgapyy))
+ //                                        );