source: issm/oecreview/Archive/22819-23185/ISSM-23036-23037.diff@ 23186

Index: ../trunk-jpl/src/c/analyses/GLheightadvectionAnalysis.cpp
===================================================================
--- ../trunk-jpl/src/c/analyses/GLheightadvectionAnalysis.cpp   (revision 23036)
+++ ../trunk-jpl/src/c/analyses/GLheightadvectionAnalysis.cpp   (revision 23037)
@@ -86,7 +86,7 @@
        element->GetVerticesCoordinates(&xyz_list);
        //Input* vx_input=element->GetInput(BaseSlopeXEnum); _assert_(vx_input);
        //Input* vy_input=element->GetInput(BaseSlopeYEnum); _assert_(vy_input);
-       Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input);
+   Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input);
        Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input);
 
        IssmDouble h = element->CharacteristicLength();
@@ -104,8 +104,8 @@
                D_scalar=gauss->weight*Jdet;
 
                /*Diffusion */
-               if(sqrt(vx*vx+vy*vy)<10./31536000.){
-                       IssmPDouble kappa = 1.e-4;
+               if(sqrt(vx*vx+vy*vy)<1000./31536000.){
+                       IssmPDouble kappa = -10;
                        for(int i=0;i<numnodes;i++){
                                for(int j=0;j<numnodes;j++){
                                        Ke->values[i*numnodes+j] += D_scalar*kappa*(dbasis[0*numnodes+j]*dbasis[0*numnodes+i] + dbasis[1*numnodes+j]*dbasis[1*numnodes+i]);
@@ -112,13 +112,12 @@
                                }
                        }
                }
-
                /*Advection: */
                vx_input->GetInputValue(&vx,gauss);
                vy_input->GetInputValue(&vy,gauss);
                for(int i=0;i<numnodes;i++){
                        for(int j=0;j<numnodes;j++){
-                               Ke->values[i*numnodes+j] += D_scalar*(vx*dbasis[0*numnodes+j]*basis[i] + vy*dbasis[1*numnodes+j]*basis[i]);
+                               Ke->values[i*numnodes+j] += (D_scalar*(vx*dbasis[0*numnodes+j]*basis[i] + vy*dbasis[1*numnodes+j]*basis[i]))*1e-2;
                        }
                }