Changeset 15964

Timestamp:

08/26/13 20:05:36 (12 years ago)

Author:

seroussi

Message:

CHG: keep working on GL changes

Location:

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

Files:

• Penta.cpp (modified) (3 diffs)
• Tria.cpp (modified) (5 diffs)

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

@@ -11253 +11253 @@
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
                                 }
-                                else if(migration_style==SoftMigrationEnum && reCast<int,IssmDouble>(sheet_ungrounding[nodes[i]->Sid()])){
+                                else if(migration_style==SoftMigrationEnum && reCast<int,IssmDouble>(sheet_ungrounding[vertices[i]->Sid()])){
                                         s[i]        = (1-density)*h[i];
                                         b[i]        = -density*h[i];
@@ -11341 +11341 @@
                         if(bed_hydro>r[i]){
                                 /*Vertex that could potentially unground, flag it*/
-                                potential_ungrounding->SetValue(nodes[i]->Sid(),1,INS_VAL);
+                                potential_ungrounding->SetValue(vertices[i]->Sid(),1,INS_VAL);
                         }
                 }
@@ -11356 +11356 @@
         for(i=0;i<NUMVERTICES;i++){
                 if (reCast<bool,IssmDouble>(vertices_potentially_ungrounding[nodes[i]->Sid()])){
-                        vec_nodes_on_iceshelf->SetValue(nodes[i]->Sid(),1,INS_VAL);
+                        vec_nodes_on_iceshelf->SetValue(vertices[i]->Sid(),1,INS_VAL);
 
                         /*If node was not on ice shelf, we flipped*/
-                        if(nodes_on_iceshelf[nodes[i]->Sid()]==0){
+                        if(nodes_on_iceshelf[vertices[i]->Sid()]==0){
                                 nflipped++;
                         }

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

@@ -7312 +7312 @@
 #ifdef _HAVE_GROUNDINGLINE_
 /*FUNCTION Tria::MigrateGroundingLine{{{*/
-void  Tria::MigrateGroundingLine(IssmDouble* sheet_ungrounding){
+void  Tria::MigrateGroundingLine(IssmDouble* phi_ungrounding){
 
         int        i,migration_style;
@@ -7363 +7363 @@
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
                                 }
-                                else if(migration_style==SoftMigrationEnum && reCast<bool>(sheet_ungrounding[nodes[i]->Sid()])){
+                                else if(migration_style==SoftMigrationEnum && reCast<bool>(sheet_ungrounding[vertices[i]->Sid()])){
+                                //else if(migration_style==SoftMigrationEnum && phi_ungrounding[vertices[i]->Sid()]<0.){
                                         s[i]        = (1-density)*h[i];
                                         b[i]        = -density*h[i];
@@ -7413 +7414 @@
                 if(migration_style==SoftMigrationEnum){
                         bed_hydro=-density*h[i];
-                        if(phi[i]<0. || bed_hydro<=r[i] || reCast<bool>(sheet_ungrounding[nodes[i]->Sid()])){
+                        //if(phi[i]<0. || bed_hydro<=r[i] || phi_ungrounding[vertices[i]->Sid()]<0.){
+                        if(phi[i]<0. || bed_hydro<=r[i] || reCast<bool>(sheet_ungrounding[vertices[i]->Sid()])){
                                 phi[i]=h[i]+r[i]/density;
                         }
@@ -7444 +7446 @@
                         if(bed_hydro>r[i]){
                                 /*Vertex that could potentially unground, flag it*/
-                                potential_ungrounding->SetValue(nodes[i]->Sid(),1,INS_VAL);
+                                potential_ungrounding->SetValue(vertices[i]->Sid(),1,INS_VAL);
                         }
                 }
@@ -7458 +7460 @@
         /*Go through nodes, and whoever is on the potential_ungrounding, ends up in nodes_on_iceshelf: */
         for(i=0;i<3;i++){
-                if (reCast<bool>(vertices_potentially_ungrounding[nodes[i]->Sid()])){
-                        vec_nodes_on_iceshelf->SetValue(nodes[i]->Sid(),1,INS_VAL);
+                if (reCast<bool>(vertices_potentially_ungrounding[vertices[i]->Sid()])){
+                        vec_nodes_on_iceshelf->SetValue(vertices[i]->Sid(),1,INS_VAL);
 
                         /*If node was not on ice shelf, we flipped*/
-                        if(nodes_on_iceshelf[nodes[i]->Sid()]==0){
+                        if(nodes_on_iceshelf[vertices[i]->Sid()]==0){
                                 nflipped++;
                         }