Changeset 17582

Timestamp:

03/27/14 16:29:34 (11 years ago)

Author:

hongjuy

Message:

CHG: some minor details in FS contact migration

Location:

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

Files:

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

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

@@ -1316 +1316 @@
 }
 /*}}}*/
+/*FUNCTION Tria::FSContactMigration{{{*/
+void Tria::FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){
+
+        if(!IsOnBed()) return;
+
+        /*Intermediaries*/
+        IssmDouble* xyz_list = NULL;
+
+        /*Figure out wether element is grounded or floating*/
+        bool grounded = true;
+
+        /* Get node coordinates and dof list: */
+        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
+
+        /*Retrieve all inputs we will be needing: */
+        Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
+        Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
+        Input* vy_input=inputs->GetInput(VyEnum);             _assert_(vy_input);
+
+        _error_("STOP");
+
+        for(i=0;i<NUMVERTICES;i++){
+                if(grounded) vertexgrounded->SetValue(vertices[i]->Pid(),+1.,INS_VAL);
+                else         vertexfloating->SetValue(vertices[i]->Pid(),+1.,INS_VAL);
+        }
+
+        /*clean up*/
+        xDelete<IssmDouble>(xyz_list);
+
+}
+/*}}}*/
 /*FUNCTION Tria::IsNodeOnShelfFromFlags {{{*/
 bool   Tria::IsNodeOnShelfFromFlags(IssmDouble* flags){
@@ -4264 +4295 @@
 
         if(migration_style==ContactEnum){
+                for(i=0;i<NUMVERTICES;i++) phi[i]=phi_ungrounding[vertices[i]->Pid()];
                 this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum));
                 return;

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

@@ -59 +59 @@
                 void        Delta18oParameterization(void);
                 void        ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz);
-                void        FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){_error_("not implemented yet");};
+                void        FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating);
                 int         FiniteElement(void);
                 Element*    GetUpperElement(void){_error_("not implemented yet");};