Changeset 15982

Timestamp:

08/27/13 15:36:54 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: Element do not update constraints

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Element.h (modified) (1 diff)
• Elements/Penta.cpp (modified) (1 diff)
• Elements/Penta.h (modified) (1 diff)
• Elements/Tria.cpp (modified) (1 diff)
• Elements/Tria.h (modified) (1 diff)
• FemModel.cpp (modified) (1 diff)

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

@@ -78 +78 @@
                 virtual void   Delta18oParameterization(void)=0;
                 virtual void   SmbGradients()=0;
-                virtual void UpdateConstraints(void)=0; 
                 virtual void   ResetCoordinateSystem()=0;
 

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

@@ -3722 +3722 @@
                         break;
         }
-}
-/*}}}*/
-/*FUNCTION Penta::UpdateConstraints{{{*/
-void Penta::UpdateConstraints(void){
-
-        /*Do nothing for now*/
-
 }
 /*}}}*/

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

@@ -231 +231 @@
                 Tria*            SpawnTria(int location);
                 void             SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]);
-                void           UpdateConstraints(void);
 
                 #ifdef _HAVE_STRESSBALANCE_

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

@@ -2498 +2498 @@
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.
         this->parameters=NULL;
-}
-/*}}}*/
-/*FUNCTION Tria::UpdateConstraints{{{*/
-void  Tria::UpdateConstraints(void){
-
-        int analysis_type;
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-
-        /*Skip if water element*/
-        if(NoIceInElement()) return;
-
 }
 /*}}}*/

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

@@ -223 +223 @@
                 void             SetClone(int* minranks);
                 void             SurfaceNormal(IssmDouble* surface_normal, IssmDouble xyz_list[3][3]);
-                void             UpdateConstraints(void);
 
                 #ifdef _HAVE_STRESSBALANCE_

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -686 +686 @@
         /*start module: */
         if(VerboseModule()) _printf0_("   Updating constraints for time: " << time << "\n");
-
-        /*First, Nodes might be activated/deactivated by element*/
-        for(int i=0;i<elements->Size();i++){
-                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                element->UpdateConstraints();
-        }
 
         /*Second, constraints might be time dependent: */