Changeset 26434

Timestamp:

09/08/21 06:39:02 (4 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing levelset SUPG

File:

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

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

@@ -321 +321 @@
                         case 5:{
                                 /*SUPG*/
-                                mf_vx_input->GetInputAverage(&w[0]);
-                                mf_vy_input->GetInputAverage(&w[1]);
-                                vel=sqrt(w[0]*w[0]+w[1]*w[1])+1.e-8;
+                                IssmDouble vx,vy;
+                                mf_vx_input->GetInputAverage(&vx);
+                                mf_vy_input->GetInputAverage(&vy);
+                                vel=sqrt(vx*vx+vy*vy)+1.e-8;
                                 IssmPDouble xi=1.;
                                 IssmDouble  tau=xi*h/(2*vel);
 
-                                IssmDouble vx,vy;
-                                vx = w[0]; vy = w[1];
                                 /*Mass matrix - part 2*/
                                 for(int i=0;i<numnodes;i++){
@@ -371 +370 @@
         /*Fetch number of nodes and dof for this finite element*/
         int numnodes = basalelement->GetNumberOfNodes();
-        basalelement->FindParam(&stabilization,MasstransportStabilizationEnum);
+        basalelement->FindParam(&stabilization,LevelsetStabilizationEnum);
 
         /*Initialize Element vector*/
@@ -406 +405 @@
                         mf_vy_input->GetInputAverage(&vy);
                         vel=sqrt(vx*vx+vy*vy)+1.e-8;
-                        IssmPDouble xi=1;
+                        IssmPDouble xi=1.;
                         IssmDouble  tau=xi*h/(2*vel);