Changeset 15940

Timestamp:

08/26/13 09:58:29 (12 years ago)

Author:

seroussi

Message:

CHG: mask.gllevelset will now be used not matter the GL migration style

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -11221 +11221 @@
         GetInputListOnVertices(&b[0],BedEnum);
         GetInputListOnVertices(&r[0],BathymetryEnum);
-        if(migration_style==SubelementMigrationEnum) GetInputListOnVertices(&phi[0],GLlevelsetEnum);
+        GetInputListOnVertices(&phi[0],GLlevelsetEnum);
         rho_water = matpar->GetRhoWater();
         rho_ice   = matpar->GetRhoIce();
@@ -11299 +11299 @@
 
         /*Recalculate phi*/
-        if(migration_style==SubelementMigrationEnum){
-                for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
-                this->inputs->AddInput(new PentaInput(GLlevelsetEnum,&phi[0],P1Enum));
-                this->InputExtrude(GLlevelsetEnum,ElementEnum);
-        }
+        for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
+        this->inputs->AddInput(new PentaInput(GLlevelsetEnum,&phi[0],P1Enum));
+        this->InputExtrude(GLlevelsetEnum,ElementEnum);
 
         /*Extrude inputs*/

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -7410 +7410 @@
 
         /*Recalculate phi*/
-        if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){
-                for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
-                this->inputs->AddInput(new TriaInput(GLlevelsetEnum,&phi[0],P1Enum));
-        }
+        for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
+        this->inputs->AddInput(new TriaInput(GLlevelsetEnum,&phi[0],P1Enum));
 }
 /*}}}*/