Changeset 18337

Timestamp:

08/06/14 13:22:01 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added check on supported stabilization flags

File:

• issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (modified) (2 diffs)

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

@@ -15 +15 @@
 
         parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsFSEnum));
-
         parameters->AddObject(iomodel->CopyConstantObject(MasstransportIsfreesurfaceEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MasstransportHydrostaticAdjustmentEnum));
@@ -362 +361 @@
                                         &Ke->values[0],1);
 
-                if(stabilization==2){
-                        if(dim==1){
-                                vel=fabs(vx)+1.e-8;
-                                D[0]=h/(2*vel)*vx*vx;
-                        }
-                        else{
-                                /*Streamline upwinding*/
-                                vel=sqrt(vx*vx+vy*vy)+1.e-8;
-                                D[0*dim+0]=h/(2*vel)*vx*vx;
-                                D[1*dim+0]=h/(2*vel)*vy*vx;
-                                D[0*dim+1]=h/(2*vel)*vx*vy;
-                                D[1*dim+1]=h/(2*vel)*vy*vy;
-                        }
-                }
-                else if(stabilization==1){
-                        /*SSA*/
-                        vxaverage_input->GetInputAverage(&vx);
-                        if(dim==2) vyaverage_input->GetInputAverage(&vy);
-                        D[0*dim+0]=h/2.0*fabs(vx);
-                        if(dim==2) D[1*dim+1]=h/2.0*fabs(vy);
+                switch(stabilization){
+                        case 0:
+                                /*Nothing to be onde*/
+                                break;
+                        case 1:
+                                /*SSA*/
+                                vxaverage_input->GetInputAverage(&vx);
+                                if(dim==2) vyaverage_input->GetInputAverage(&vy);
+                                D[0*dim+0]=h/2.0*fabs(vx);
+                                if(dim==2) D[1*dim+1]=h/2.0*fabs(vy);
+                                break;
+                        case 2:
+                                if(dim==1){
+                                        vel=fabs(vx)+1.e-8;
+                                        D[0]=h/(2*vel)*vx*vx;
+                                }
+                                else{
+                                        /*Streamline upwinding*/
+                                        vel=sqrt(vx*vx+vy*vy)+1.e-8;
+                                        D[0*dim+0]=h/(2*vel)*vx*vx;
+                                        D[1*dim+0]=h/(2*vel)*vy*vx;
+                                        D[0*dim+1]=h/(2*vel)*vx*vy;
+                                        D[1*dim+1]=h/(2*vel)*vy*vy;
+                                }
+                                break;
+                        default:
+                                _error_("Stabilization "<<stabilization<<" not supported yet");
                 }
                 if(stabilization==1 || stabilization==2){