Changeset 23189 for issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

Timestamp:

08/28/18 09:45:51 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23187

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (5 diffs)

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -15 +15 @@
         Element            *element                          = NULL;
 
-
         /*retrieve parameters: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
@@ -21 +20 @@
 
         if(migration_style==NoneEnum) return;
-        
+
         if(VerboseModule()) _printf0_("   Migrating grounding line\n");
 
@@ -37 +36 @@
                         phi_ungrounding=ContactFSLevelset(elements,vertices);
                         break;
+                case SubelementMigrationEnum:
                 case AggressiveMigrationEnum:
-                case SubelementMigrationEnum:
-                case SubelementMigration2Enum:
                 case GroundingOnlyEnum:
                         /*Nothing additional to do here, MigrateGroundingLine takes care of everything*/
@@ -60 +58 @@
 IssmDouble*    ContactFSLevelset(Elements* elements,Vertices* vertices){ /*{{{*/
 
-        Vector<IssmDouble>* vertexgrounded = NULL;
-        Vector<IssmDouble>* vertexfloating = NULL;
-        IssmDouble*  serial_vertexgrounded = NULL;
-        IssmDouble*  serial_vertexfloating = NULL;
+        Vector<IssmDouble>* vertex_sigmann = NULL;
+        Vector<IssmDouble>* vertex_waterpressure = NULL;
+        IssmDouble*  serial_vertex_sigmann = NULL;
+        IssmDouble*  serial_vertex_waterpressure = NULL;
         IssmDouble*  phi                   = NULL;
 
         /*Initialize vector with number of vertices*/
         int numberofvertices = vertices->NumberOfVertices();
-        vertexgrounded = new Vector<IssmDouble>(numberofvertices);
-        vertexfloating = new Vector<IssmDouble>(numberofvertices);
+        vertex_sigmann = new Vector<IssmDouble>(numberofvertices);
+        vertex_waterpressure = new Vector<IssmDouble>(numberofvertices);
         phi            = xNew<IssmDouble>(numberofvertices);
 
@@ -75 +73 @@
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->FSContactMigration(vertexgrounded,vertexfloating);
+                element->FSContactMigration(vertex_sigmann,vertex_waterpressure);
         }
+        /*Assemble vector and serialize */
+        vertex_sigmann->Assemble();
+        vertex_waterpressure->Assemble();
+        serial_vertex_sigmann=vertex_sigmann->ToMPISerial();
+        serial_vertex_waterpressure=vertex_waterpressure->ToMPISerial();
 
-        /*Assemble vector and serialize */
-        vertexgrounded->Assemble();
-        vertexfloating->Assemble();
-        serial_vertexgrounded=vertexgrounded->ToMPISerial();
-        serial_vertexfloating=vertexfloating->ToMPISerial();
         for(int i=0;i<numberofvertices;i++){
-                        if (serial_vertexgrounded[i]==1. && serial_vertexfloating[i]==1.) phi[i]=0.;
-                        else if (serial_vertexgrounded[i]==1) phi[i]=1;
-                        else if (serial_vertexfloating[i]==1) phi[i]=-1;
-                        else if (serial_vertexgrounded[i]>10) phi[i]=9999;
-                        else phi[i]=-9999;
+                if (serial_vertex_waterpressure[i] > serial_vertex_sigmann[i]) phi[i]=-1;
+                else phi[i]=1;
         }
 
         /*free ressouces and return: */
-        delete vertexgrounded;
-        delete vertexfloating;
-        xDelete<IssmDouble>(serial_vertexgrounded);
-        xDelete<IssmDouble>(serial_vertexfloating);
+        delete vertex_sigmann;
+        delete vertex_waterpressure;
+        xDelete<IssmDouble>(serial_vertex_sigmann);
+        xDelete<IssmDouble>(serial_vertex_waterpressure);
 
         return phi;