Changeset 4172

Timestamp:

06/23/10 14:20:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed compilation

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (2 diffs)
• objects/DofObject.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Elements/Tria.h (modified) (1 diff)
• objects/Params/IntParam.h (modified) (1 diff)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -489 +489 @@
         int sid;
         vector<Object*>::iterator object;
+        DofObject* dofobject=NULL;
 
         for ( object=objects.begin() ; object < objects.end(); object++ ){
@@ -496 +497 @@
 
                 /*Which id does it have: */
-                sid=(*object)->Sid();
+                dofobject=dynamic_cast<DofObject*>(*object);
+                sid=dofobject->Sid();
 
                 /*Plug rank into ranks, according to id: */

issm/trunk/src/c/objects/DofObject.h

@@ -18 +18 @@
                 virtual void  UpdateCloneDofs(int* allborderdofs)=0;
                 virtual void  SetClone(int* minranks)=0;
+                virtual int   Sid(void)=0;
                 virtual void  CreatePartition(Vec partition)=0;
 

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -543 +543 @@
 
 /*Updates: */
+/*FUNCTION Tria::UpdateGeometry{{{1*/
+void  Tria::UpdateGeometry(void){
+
+        /*Intermediaries*/
+        double rho_ice,rho_water;
+
+        /*recover material parameters: */
+        rho_ice=matpar->GetRhoIce();
+        rho_water=matpar->GetRhoWater();
+
+        ISSMERROR("not supported yet!");
+}
+/*}}}*/
 /*FUNCTION Tria::UpdateFromDakota {{{1*/
 void  Tria::UpdateFromDakota(void* vinputs){

issm/trunk/src/c/objects/Elements/Tria.h

@@ -40 +40 @@
                 Tria(int tria_id,int i, IoModel* iomodel,int nummodels);
                 void  Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type);
-                void  UpdateGeometry(void){ISSMERROR("not implemented yet, see UpdateGeometryx of issm2.2");};
+                void  UpdateGeometry(void);
                 ~Tria();
                 /*}}}*/

issm/trunk/src/c/objects/Params/IntParam.h

@@ -19 +19 @@
 #include <mex.h>
 #endif
-
 
 #include "./Param.h"