Changeset 4021

Timestamp:

06/03/10 15:20:44 (15 years ago)

Author:

Eric.Larour

Message:

Some debuggin for compilation purposes

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (3 diffs)
• DataSet/DataSet.h (modified) (1 diff)
• modules/ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (1 diff)
• modules/ConfigureObjectsx/ConfigureObjectsx.h (modified) (1 diff)
• modules/MeshPartitionx/MeshPartitionx.cpp (modified) (2 diffs)
• modules/MeshPartitionx/MeshPartitionx.h (modified) (1 diff)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• modules/OutputResultsx/OutputResultsx.h (modified) (1 diff)
• objects/Elements/Beam.cpp (modified) (16 diffs)
• objects/Elements/Beam.h (modified) (4 diffs)
• objects/Elements/Penta.cpp (modified) (16 diffs)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/PentaHook.cpp (modified) (1 diff)
• objects/Elements/Sing.cpp (modified) (19 diffs)
• objects/Elements/Sing.h (modified) (2 diffs)
• objects/Elements/Tria.cpp (modified) (16 diffs)
• objects/Elements/Tria.h (modified) (1 diff)
• objects/Elements/TriaHook.cpp (modified) (1 diff)
• objects/Loads/Icefront.cpp (modified) (5 diffs)
• objects/Loads/Numericalflux.cpp (modified) (2 diffs)
• objects/Loads/Pengrid.cpp (modified) (3 diffs)
• objects/Loads/Penpair.cpp (modified) (1 diff)
• objects/Loads/Riftfront.cpp (modified) (2 diffs)
• objects/Materials/Matice.cpp (modified) (2 diffs)
• objects/Node.cpp (modified) (8 diffs)
• shared/Dofs/DistributeNumDofs.cpp (modified) (2 diffs)
• shared/Dofs/dofs.h (modified) (1 diff)
• solutions/diagnostic.cpp (modified) (2 diffs)
• solutions/solutions.h (modified) (2 diffs)
• toolkits/metis/metisincludes.h (modified) (1 diff)

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

@@ -550 +550 @@
 /*Objects methods*/
 /*FUNCTION DataSet::Configure{{{1*/
-void DataSet::Configure(DataSet* elements,DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,analysis_counter,analysis_type){
+void DataSet::Configure(DataSet* elements,DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_counter,int analysis_type){
 
         vector<Object*>::iterator object;
@@ -562 +562 @@
 
                         element=(Element*)(*object);
-                        element->Configure(elements,loads,nodes,materials,parameters);
+                        element->Configure(elements,loads,nodes,materials,parameters,analysis_counter);
                 }
                 if(EnumIsLoad((*object)->Enum())){
@@ -924 +924 @@
 
                         rgb=(Rgb*)(*object);
-                        if(rgb->InAnalysis(analysis_type))count++
+                        if(rgb->InAnalysis(analysis_type))count++;
                 }
         }

issm/trunk/src/c/DataSet/DataSet.h

@@ -58 +58 @@
                 void  FlagClones(int numberofnodes);
                 int   NumberOfDofs(int analysis_type);
-                int   NumberOfRgbs();
+                int   NumberOfRgbs(int analysis_type);
                 void  SetupSpcs(DataSet* nodes,Vec yg,int analysis_type);
                 void  SetupMpcs(Mat Rmg,DataSet* nodes,int analysis_type);

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

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_type){
+int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_counter,int analysis_type){
 
         /*Intermediary*/

issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.h

@@ -9 +9 @@
 
 /* local prototypes: */
-int ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,int analysis_type);
+int ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,int analysis_counter, int analysis_type);
 
 #endif  /* _CONFIGUREOBJECTSX_H */

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

@@ -10 +10 @@
 
 int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofgrids,double* elements,
-                int numberofelements2d,int numberofgrids2d,double* elements2d,int numlayers,int elements_width, char* meshtype,int num_procs){
+                int numberofelements2d,int numberofgrids2d,double* elements2d,int numlayers,int elements_width, int dim,int num_procs){
 
         int noerr=1;
@@ -30 +30 @@
         int  edgecut=1;
 
-        if(strcmp(meshtype,"2d")==0){
+        if(dim==2){
                 epart=(int*)xmalloc(numberofelements*sizeof(int));
                 npart=(int*)xmalloc(numberofgrids*sizeof(int));

issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.h

@@ -8 +8 @@
 /* local prototypes: */
 int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofgrids,double* elements,
-                int numberofelements2d,int numberofgrids2d,double* elements2d,int numlayers,int elements_width, char* meshtype,int numareas);
+                int numberofelements2d,int numberofgrids2d,double* elements2d,int numlayers,int elements_width, int dim,int numareas);
         
 #endif /* _MESHPARTITIONX_H */

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

@@ -13 +13 @@
 #include "../../io/io.h"
 #include "../../objects/objects.h"
-
-void OutputResults(DataSet* results,char* filename){
-
-        int i;
-        Result* result=NULL;
-        FILE* fid=NULL;
-        extern int my_rank;
-
-        /* Open output file to write raw binary data: */
-        if(my_rank==0){
-                fid=pfopen(filename,"wb");
-
-                for(i=0;i<results->Size();i++){
-                        result=(Result*)results->GetObjectByOffset(i);
-
-                        /*write result to disk: */
-                        result->WriteData(fid);
-                }
                 
-                /*Close file: */
-                pfclose(fid,filename);
-        }
+void OutputResults(FemModel* femmodel, char* filename,int analysis_type){
 
 
-        /*output if we have rifts: */
-        if(numrifts){
-                OutputRiftsx( &riftproperties,fem_dh->loads,numrifts);
-                results->AddObject(new Result(results->Size()+1,0,1,"riftproperties",riftproperties));
-        }
-
+        ISSMERROR(" not supported yet!");
+        
+        
+//      
+//      
+//      int i;
+//      Result* result=NULL;
+//      FILE* fid=NULL;
+//      extern int my_rank;
+//
+//      /* Open output file to write raw binary data: */
+//      if(my_rank==0){
+//              fid=pfopen(filename,"wb");
+//
+//              for(i=0;i<results->Size();i++){
+//                      result=(Result*)results->GetObjectByOffset(i);
+//
+//                      /*write result to disk: */
+//                      result->WriteData(fid);
+//              }
+//              
+//              /*Close file: */
+//              pfclose(fid,filename);
+//      }
+//
+//
+//      /*output if we have rifts: */
+//      if(numrifts){
+//              OutputRiftsx( &riftproperties,fem_dh->loads,numrifts);
+//              results->AddObject(new Result(results->Size()+1,0,1,"riftproperties",riftproperties));
+//      }
+//
 
 }

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h

@@ -9 +9 @@
 
 /* local prototypes: */
-void OutputResults(DataSet* results,char* filename);
+void OutputResults(FemModel* femmodel, char* filename,int analysis_type);
 
 #endif  /* _OUTPUTRESULTS_H */

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

@@ -33 +33 @@
 
 /*Object management*/
-/*FUNCTION Beam::Configure{{{1*/
-void  Beam::Configure(DataSet* elementsin,DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin,int analysis_counter){
-
-        int i;
-        
-        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
-         * datasets, using internal ids and offsets hidden in hooks: */
-        hnodes.configure(nodesin);
-        hmatice.configure(materialsin);
-        hmatpar.configure(materialsin);
-
-        /*point parameters to real dataset: */
-        this->parameters=parametersin;
-
-}
-/*}}}*/
 /*FUNCTION Beam::copy{{{1*/
 Object* Beam::copy() {
-        
-        return new Beam(this->id,&this->hnodes,&this->hmatice,&this->hmatpar,this->parameters,this->inputs);
-
+
+        int i;
+        Beam* beam=NULL;
+
+        beam=new Beam();
+
+        /*copy fields: */
+        beam->id=this->id;
+        if(this->inputs){
+                beam->inputs=(Inputs*)this->inputs->Copy();
+        }
+        else{
+                beam->inputs=new Inputs();
+        }
+        /*point parameters: */
+        beam->parameters=this->parameters;
+
+        /*pointers: */
+        beam->nodes=(Node**)xmalloc(2*sizeof(Node*)); 
+        for(i=0;i<2;i++)beam->nodes[i]=this->nodes[i];
+        beam->matice=this->matice;
+        beam->matpar=this->matpar;
+
+        return beam;
 }
 /*}}}*/
@@ -59 +64 @@
 void Beam::DeepEcho(void){
 
+        int i;
+
         printf("Beam:\n");
         printf("   id: %i\n",id);
-        hnodes.DeepEcho();
-        hmatice.DeepEcho();
-        hmatpar.DeepEcho();
+        for(i=0;i<2;i++){
+                nodes[i]->DeepEcho();
+        }
+        matice->DeepEcho();
+        matpar->DeepEcho();
         printf("   parameters\n");
         parameters->DeepEcho();
@@ -74 +83 @@
 /*FUNCTION Beam::Demarshall{{{1*/
 void  Beam::Demarshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   i;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*this time, no need to get enum type, the pointer directly points to the beginning of the 
-         *object data (thanks to DataSet::Demarshall):*/
-        memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id);
-
-        /*demarshall hooks: */
-        hnodes.Demarshall(&marshalled_dataset);
-        hmatice.Demarshall(&marshalled_dataset);
-        hmatpar.Demarshall(&marshalled_dataset);
-
-        /*demarshall inputs: */
-        inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); 
-
-        /*parameters: may not exist even yet, so let Configure handle it: */
-        this->parameters=NULL;
-
-        /*return: */
-        *pmarshalled_dataset=marshalled_dataset;
-        return;
+        ISSMERROR("not supported yet!");
 }
 /*}}}*/
@@ -104 +89 @@
 void Beam::Echo(void){
 
+        int i;
+
         printf("Beam:\n");
         printf("   id: %i\n",id);
-        hnodes.Echo();
-        hmatice.Echo();
-        hmatpar.Echo();
+        for(i=0;i<2;i++){
+                nodes[i]->DeepEcho();
+        }
+        matice->DeepEcho();
+        matpar->DeepEcho();
         printf("   parameters\n");
         parameters->Echo();
@@ -128 +117 @@
 /*FUNCTION Beam::Marshall{{{1*/
 void  Beam::Marshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   enum_type=0;
-        char* marshalled_inputs=NULL;
-        int   marshalled_inputs_size;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*get enum type of Beam: */
-        enum_type=BeamEnum;
-        
-        /*marshall enum: */
-        memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
-        
-        /*marshall Beam data: */
-        memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id);
-
-        /*Marshall hooks: */
-        hnodes.Marshall(&marshalled_dataset);
-        hmatice.Marshall(&marshalled_dataset);
-        hmatpar.Marshall(&marshalled_dataset);
-
-        /*Marshall inputs: */
-        marshalled_inputs_size=inputs->MarshallSize();
-        marshalled_inputs=inputs->Marshall();
-        memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char));
-        marshalled_dataset+=marshalled_inputs_size;
-        
-        /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/
-
-        xfree((void**)&marshalled_inputs);
-
-        *pmarshalled_dataset=marshalled_dataset;
-        return;
+        ISSMERROR("not supported yet!");
 }
 /*}}}*/
 /*FUNCTION Beam::MarshallSize{{{1*/
 int   Beam::MarshallSize(){
-        
-        return sizeof(id)
-                +hnodes.MarshallSize()
-                +hmatice.MarshallSize()
-                +hmatpar.MarshallSize()
-                +inputs->MarshallSize()
-                +sizeof(int); //sizeof(int) for enum type
+        ISSMERROR("not supported yet!");
 }
 /*}}}*/
@@ -207 +156 @@
         double gauss[numgrids][numgrids]={{1,0},{0,1}};
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        Matpar* matpar=NULL;
-        Matice* matice=NULL;
-        
         /*Get dof list on which we will plug the pressure values: */
         GetDofList1(&doflist[0]);
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        matpar=(Matpar*)hmatpar.delivers();
-        matice=(Matice*)hmatice.delivers();
 
         /*Get node data: */
@@ -288 +227 @@
         double one0,one1;
         
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-
         connectivity[0]=nodes[0]->GetConnectivity();
         connectivity[1]=nodes[1]->GetConnectivity();
@@ -387 +320 @@
         bool onsurface;
         int  connectivity[2];
-
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        Matpar* matpar=NULL;
-        Matice* matice=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        matpar=(Matpar*)hmatpar.delivers();
-        matice=(Matice*)hmatice.delivers();
 
         /*recover doflist: */
@@ -510 +433 @@
         int numberofdofspernode;
         
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        
         for(i=0;i<2;i++){
                 nodes[i]->GetDofList(&doflist_per_node[0],&numberofdofspernode);
@@ -531 +448 @@
 void  Beam::GetDofList1(int* doflist){
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        
         int i;
         for(i=0;i<2;i++){
@@ -564 +475 @@
 /*FUNCTION Beam::GetMatPar{{{1*/
 void* Beam::GetMatPar(){
-
-        /*dynamic objects pointed to by hooks: */
-        Matpar* matpar=NULL;
-
-        /*recover objects from hooks: */
-        matpar=(Matpar*)hmatpar.delivers();
 
         return matpar;
@@ -591 +496 @@
         Node** pnodes=NULL;
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        
         /*recover nodes: */
         pnodes=(Node**)vpnodes;
 
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        
         for(i=0;i<3;i++){
                 pnodes[i]=nodes[i];
@@ -677 +576 @@
         /*Check that name is an element input*/
         if (!IsInput(name)) return;
-        Node**  nodes=NULL;
-
         switch(type){
 
@@ -687 +584 @@
 
                         /*Get values on the 6 vertices*/
-                        nodes=(Node**)hnodes.deliverp();
                         for (int i=0;i<2;i++){
                                 values[i]=vector[nodes[i]->GetVertexDof()];
@@ -780 +676 @@
         bool     found      = false;
         int      count      = 0;
-        Node   **nodes      = NULL;
         double  *this_patch = NULL;
 
@@ -801 +696 @@
                 count=*pcount;
 
-                /*Recover nodes: */
-                nodes=(Node**)hnodes.deliverp();
-
                 /*set this_patch to point at the beginning of the patches row, where we will plug our information :*/
                 this_patch=patches+numcols*count;

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

@@ -14 +14 @@
 class Inputs;
 class IoModel;
+class Node;
+class Matice;
+class Matpar;
 
 #include "../../shared/Exceptions/exceptions.h"
@@ -26 +29 @@
                 int id;
 
-                Hook hnodes;  //hook to 2 nodes
-                Hook hmatice; //hook to 1 matice
-                Hook hmatpar; //hook to 1 matpar
+                Node**  nodes; //2 nodes
+                Matice* matice;
+                Matpar* matpar;
                 
                 Parameters* parameters; //pointer to solution parameters
@@ -39 +42 @@
                 /*}}}*/
                 /*object management: {{{1*/
+                void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
                 void  Echo();
                 void  DeepEcho();
@@ -48 +52 @@
                 bool  IsInput(int name);
                 int   MyRank();
-                void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
                 Object* copy();
                 void  SetClone(int* minranks);

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

@@ -78 +78 @@
 
         //collpase flags
-        collapse=(bool*)xcalloc(nummodels*sizeof(bool));
-
-}
-/*}}}*/
-/*FUNCTION Penta::Update(IoModel* iomodel,int analysis_counter) {{{1*/
-Penta::Update(IoModel* iomodel,int analysis_counter){ 
+        collapse=(bool*)xcalloc(nummodels,sizeof(bool));
+
+}
+/*}}}*/
+/*FUNCTION Penta::Update(IoModel* iomodel,int analysis_counter,int analysis_type) {{{1*/
+void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type){ 
 
         /*Intermediaries*/
@@ -107 +107 @@
 
         /*hooks: */
-        this->SettHookNodes(penta_node_ids,analysis_counter); this->nodes=NULL; //set hook to nodes, for this analysis type
+        this->SetHookNodes(penta_node_ids,analysis_counter); this->nodes=NULL; //set hook to nodes, for this analysis type
 
         //intialize inputs, and add as many inputs per element as requested: 
@@ -227 +227 @@
 Object* Penta::copy() {
 
+        int i;
+
         Penta* penta=NULL;
 
@@ -243 +245 @@
 
         /*now deal with hooks and objects: */
-        penta->InitHookNodes(this->nummodels);
-        for(i=0;i<this->nummodels;i++)penta->hnodes[i].copy(&this->hnodes[i]);
+        penta->InitHookNodes(this->numanalyses);
+        for(i=0;i<this->numanalyses;i++)penta->hnodes[i].copy(&this->hnodes[i]);
         penta->hmatice.copy(&this->hmatice);
         penta->hmatpar.copy(&this->hmatpar);
@@ -294 +296 @@
 
         memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id);
-        memcpy(&nummodels,marshalled_dataset,sizeof(nummodels));marshalled_dataset+=sizeof(nummodels);
+        memcpy(&numanalyses,marshalled_dataset,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses);
 
         /*allocate dynamic memory: */
-        collapse=(bool*)xmalloc(nummodels*sizeof(bool));
-        InitHookNodes(nummodels);
+        collapse=(bool*)xmalloc(numanalyses*sizeof(bool));
+        InitHookNodes(numanalyses);
 
         /*demarshall hooks: */
-        for(i=0;i<nummodels;i++)hnodes[i].Demarshall(&marshalled_dataset);
+        for(i=0;i<numanalyses;i++)hnodes[i].Demarshall(&marshalled_dataset);
         hmatice.Demarshall(&marshalled_dataset);
         hmatpar.Demarshall(&marshalled_dataset);
@@ -316 +318 @@
 
         /*demarshall internal parameters: */
-        memcpy(collapse,marshalled_dataset,nummodels*sizeof(bool));marshalled_dataset+=nummodels*sizeof(bool);
+        memcpy(collapse,marshalled_dataset,numanalyses*sizeof(bool));marshalled_dataset+=numanalyses*sizeof(bool);
 
         /*parameters: may not exist even yet, so let Configure handle it: */
@@ -347 +349 @@
         inputs->DeepEcho();
         printf("   collapse: \n   ");
-        for(i=0;i<nummodels;i++)printf("%s|",value?"true":"false");
+        for(i=0;i<numanalyses;i++)printf("%s|",collapse[i]?"true":"false");
         return;
 }
@@ -384 +386 @@
         /*marshall Penta data: */
         memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id);
-        memcpy(marshalled_dataset,&nummodels,sizeof(nummodels));marshalled_dataset+=sizeof(nummodels);
+        memcpy(marshalled_dataset,&numanalyses,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses);
 
         /*Marshall hooks: */
-        for(i=0;i<nummodels;i++)hnodes[i].Marshall(&marshalled_dataset);
+        for(i=0;i<numanalyses;i++)hnodes[i].Marshall(&marshalled_dataset);
         hmatice.Marshall(&marshalled_dataset);
         hmatpar.Marshall(&marshalled_dataset);
@@ -399 +401 @@
 
         /*marshall internal parameters: */
-        memcpy(marshalled_dataset,collapse,nummodels*sizeof(bool));marshalled_dataset+=nummodels*sizeof(bool);
+        memcpy(marshalled_dataset,collapse,numanalyses*sizeof(bool));marshalled_dataset+=numanalyses*sizeof(bool);
 
         /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/
@@ -415 +417 @@
         int hnodes_size=0;;
 
-        for(i=0;i<nummodels;i++)hnodes_size+=hnodes[i].MarshallSize;
+        for(i=0;i<numanalyses;i++)hnodes_size+=hnodes[i].MarshallSize();
 
         return sizeof(id)
@@ -423 +425 @@
                 +hneighbors.MarshallSize()
                 +inputs->MarshallSize()
-                +nummodels*sizeof(bool)
+                +numanalyses*sizeof(bool)
                 +sizeof(int); //sizeof(int) for enum type
 }
@@ -429 +431 @@
 /*FUNCTION Penta::SpawnTria {{{1*/
 void*  Penta::SpawnTria(int g0, int g1, int g2){
+
+        int i;
 
         /*out of grids g0,g1 and g2 from Penta, build a tria element: */
@@ -460 +464 @@
 /*FUNCTION Penta::SpawnBeam {{{1*/
 void* Penta::SpawnBeam(int g0, int g1){
+
+        int i;
 
         /*out of grids g0,g1 and g2 from Penta, build a beam element: */
@@ -1173 +1179 @@
                 else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
         }
-        else if (analysis_type==SlopecomputeAnalysisEnum){
+        else if (analysis_type==SlopeComputeAnalysisEnum){
                 CreateKMatrixSlopeCompute( Kgg,analysis_type,sub_analysis_type);
         }
@@ -1667 +1673 @@
 
                 /*build friction object, used later on: */
-                friction=new Friction("2d",inputs,matpar);
+                friction=new Friction("2d",inputs,matpar,analysis_type);
 
                 for(i=0;i<numgrids2d;i++){
@@ -2250 +2256 @@
                 else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
         }
-        else if (analysis_type==SlopecomputeAnalysisEnum){
+        else if (analysis_type==SlopeComputeAnalysisEnum){
                 CreatePVectorSlopeCompute( pg,analysis_type,sub_analysis_type);
         }

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

@@ -43 +43 @@
                 Penta();
                 Penta(int penta_id,int i, IoModel* iomodel,int nummodels);
+                void Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type);
                 ~Penta();
                 /*}}}*/
                 /*FUNCTION object management {{{1*/
                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
-                void Update(IoModel* iomodel,int analysis_counter,int analysis_type);
                 Object* copy();
                 void  DeepEcho();

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

@@ -24 +24 @@
 PentaHook::PentaHook(){
         numanalyses=UNDEF;
-        this->hooks=NULL;
+        this->hnodes=NULL;
 }
 /*}}}*/

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

@@ -36 +36 @@
 void  Sing::Configure(DataSet* elementsin,DataSet* loadsin, DataSet* nodesin, DataSet* materialsin, Parameters* parametersin,int analysis_counter){
 
-        int i;
-        
-        /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
-         * datasets, using internal ids and offsets hidden in hooks: */
-        hnodes.configure(nodesin);
-        hmatice.configure(materialsin);
-        hmatpar.configure(materialsin);
-
-        /*point parameters to real dataset: */
-        this->parameters=parametersin;
+        ISSMERROR(" not supported yet!");
 
 }
@@ -51 +42 @@
 /*FUNCTION Sing::copy {{{1*/
 Object* Sing::copy() {
-        
-        return new Sing(this->id,&this->hnodes,&this->hmatice,&this->hmatpar,this->parameters,this->inputs);
-
+
+        int i;
+        Sing* sing=NULL;
+
+        sing=new Sing();
+
+        /*copy fields: */
+        sing->id=this->id;
+        if(this->inputs){
+                sing->inputs=(Inputs*)this->inputs->Copy();
+        }
+        else{
+                sing->inputs=new Inputs();
+        }
+        /*point parameters: */
+        sing->parameters=this->parameters;
+
+        /*pointers: */
+        sing->node=this->node;
+        sing->matice=this->matice;
+        sing->matpar=this->matpar;
+
+        return sing;
 }
 /*}}}*/
@@ -61 +72 @@
         printf("Sing:\n");
         printf("   id: %i\n",id);
-        hnodes.DeepEcho();
-        hmatice.DeepEcho();
-        hmatpar.DeepEcho();
+        node->DeepEcho();
+        matice->DeepEcho();
+        matpar->DeepEcho();
         printf("   parameters\n");
         parameters->DeepEcho();
@@ -74 +85 @@
 /*FUNCTION Sing::Demarshall {{{1*/
 void  Sing::Demarshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*this time, no need to get enum type, the pointer directly points to the beginning of the 
-         *object data (thanks to DataSet::Demarshall):*/
-        memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id);
-
-        /*demarshall hooks: */
-        hnodes.Demarshall(&marshalled_dataset);
-        hmatice.Demarshall(&marshalled_dataset);
-        hmatpar.Demarshall(&marshalled_dataset);
-
-        /*demarshall inputs: */
-        inputs=(Inputs*)DataSetDemarshallRaw(&marshalled_dataset); 
-
-        /*parameters: may not exist even yet, so let Configure handle it: */
-        this->parameters=NULL;
-
-        /*return: */
-        *pmarshalled_dataset=marshalled_dataset;
-        return;
+        ISSMERROR(" not supported yet!");
 }
 /*}}}*/
@@ -106 +94 @@
         printf("Sing:\n");
         printf("   id: %i\n",id);
-        hnodes.Echo();
-        hmatice.Echo();
-        hmatpar.Echo();
+        node->Echo();
+        matice->Echo();
+        matpar->Echo();
         printf("   parameters\n");
         parameters->Echo();
@@ -126 +114 @@
 /*FUNCTION Sing::Marshall {{{1*/
 void  Sing::Marshall(char** pmarshalled_dataset){
-
-        char* marshalled_dataset=NULL;
-        int   enum_type=0;
-        char* marshalled_inputs=NULL;
-        int   marshalled_inputs_size;
-
-        /*recover marshalled_dataset: */
-        marshalled_dataset=*pmarshalled_dataset;
-
-        /*get enum type of Sing: */
-        enum_type=SingEnum;
-        
-        /*marshall enum: */
-        memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
-        
-        /*marshall Sing data: */
-        memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id);
-        
-        /*Marshall hooks: */
-        hnodes.Marshall(&marshalled_dataset);
-        hmatice.Marshall(&marshalled_dataset);
-        hmatpar.Marshall(&marshalled_dataset);
-
-        /*Marshall inputs: */
-        marshalled_inputs_size=inputs->MarshallSize();
-        marshalled_inputs=inputs->Marshall();
-        memcpy(marshalled_dataset,marshalled_inputs,marshalled_inputs_size*sizeof(char));
-        marshalled_dataset+=marshalled_inputs_size;
-
-        /*parameters: don't do anything about it. parameters are marshalled somewhere else!*/
-
-        
-        xfree((void**)&marshalled_inputs);
-
-        *pmarshalled_dataset=marshalled_dataset;
-        return;
+        ISSMERROR(" not supported yet!");
 }
 /*}}}*/
 /*FUNCTION Sing::MashallSize {{{1*/
 int   Sing::MarshallSize(){
-
-        return sizeof(id)
-                +hnodes.MarshallSize()
-                +hmatice.MarshallSize()
-                +hmatpar.MarshallSize()
-                +inputs->MarshallSize()
-                +sizeof(int); //sizeof(int) for enum type
+        ISSMERROR(" not supported yet!");
 }
 /*}}}*/
@@ -202 +149 @@
         double rho_ice,g;
 
-        /*dynamic objects pointed to by hooks: */
-        Matpar* matpar=NULL;
-        Matice* matice=NULL;
-
         /*Get dof list on which we will plug the pressure values: */
         GetDofList1(&dof);
-
-        /*recover objects from hooks: */
-        matpar=(Matpar*)hmatpar.delivers();
-        matice=(Matice*)hmatice.delivers();
 
         /*pressure is lithostatic: */
@@ -263 +202 @@
         int    connectivity;
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  node=NULL;
-
-        /*recover objects from hooks: */
-        node=(Node**)hnodes.deliverp();
-
         /*Find connectivity of the node and divide Ke_gg by this connectivity*/
-        connectivity=node[0]->GetConnectivity();
+        connectivity=node->GetConnectivity();
         Ke_gg[0][0]=1/(double)connectivity;
         Ke_gg[1][1]=1/(double)connectivity;
@@ -314 +247 @@
         int       connectivity;
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  node=NULL;
-        Matpar* matpar=NULL;
-        Matice* matice=NULL;
-
-        /*recover objects from hooks: */
-        node=(Node**)hnodes.deliverp();
-        matpar=(Matpar*)hmatpar.delivers();
-        matice=(Matice*)hmatice.delivers();
-
         inputs->GetParameterValue(&slope[0],SurfaceSlopeXEnum);
         inputs->GetParameterValue(&slope[1],SurfaceSlopeYEnum);
@@ -330 +253 @@
 
         //Get connectivity of the node
-        connectivity=node[0]->GetConnectivity();
+        connectivity=node->GetConnectivity();
 
         //compute slope2 
@@ -379 +302 @@
         int numberofdofspernode;
         
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        
-        nodes[0]->GetDofList(&doflist_per_node[0],&numberofdofspernode);
+        node->GetDofList(&doflist_per_node[0],&numberofdofspernode);
         for(i=0;i<numberofdofspernode;i++){
                 doflist[i]=doflist_per_node[i];
@@ -398 +315 @@
 void  Sing::GetDofList1(int* doflist){
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        
         int i;
-        doflist[0]=nodes[0]->GetDofList1();
+        doflist[0]=node->GetDofList1();
 
 }
@@ -415 +326 @@
 void* Sing::GetMatPar(){
 
-        /*dynamic objects pointed to by hooks: */
-        Matpar* matpar=NULL;
-
-        /*recover objects from hooks: */
-        matpar=(Matpar*)hmatpar.delivers();
-
         return matpar;
 }
@@ -429 +334 @@
         Node** pnodes=NULL;
 
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        
         /*recover nodes: */
         pnodes=(Node**)vpnodes;
 
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-        
-        pnodes[0]=nodes[0];
+        pnodes[0]=node;
 }
 /*}}}*/
@@ -503 +402 @@
         /*Check that name is an element input*/
         if (!IsInput(name)) return;
-        Node*  node=NULL;
 
         switch(type){
@@ -513 +411 @@
 
                         /*Get values on the 6 vertices*/
-                        node=(Node*)this->hnodes.delivers();
                         value=vector[node->GetVertexDof()];
 
@@ -602 +499 @@
         bool     found      = false;
         int      count      = 0;
-        Node   **nodes      = NULL;
         double  *this_patch = NULL;
 
@@ -623 +519 @@
                 count=*pcount;
 
-                /*Recover nodes: */
-                nodes=(Node**)hnodes.deliverp();
-
                 /*set this_patch to point at the beginning of the patches row, where we will plug our information :*/
                 this_patch=patches+numcols*count;
@@ -633 +526 @@
 
                 /*Fill in vertices ids: */
-                for(i=0;i<1;i++) this_patch[2+i]=nodes[i]->GetVertexId(); //vertices id start at column 3 of the patch.
+                for(i=0;i<1;i++) this_patch[2+i]=node->GetVertexId(); //vertices id start at column 3 of the patch.
 
                 /*We found the input, get it to fill the interpolation type, and the nodal values:*/

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

@@ -13 +13 @@
 class Inputs;
 class IoModel;
+class Node;
+class Matice;
+class Matpar;
 
 #include "../../include/include.h"
@@ -26 +29 @@
                 int id;
 
-                Hook hnodes;  //hook to 1 nodes
-                Hook hmatice; //hook to 1 matice
-                Hook hmatpar; //hook to 1 matpar
+                Node* node; 
+                Matice* matice;
+                Matpar* matpar;
                 
                 Parameters* parameters; //pointer to solution parameters

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

@@ -28 +28 @@
         this->inputs=NULL;
         this->parameters=NULL;
-        this->collapse=NULL;
 }
 /*}}}*/
@@ -35 +34 @@
         delete inputs;
         this->parameters=NULL;
-        xfree((void**)&collapse);
 }
 /*}}}*/
@@ -56 +54 @@
 
         this->InitHookNodes(nummodels);this->nodes=NULL;
-        this->InitHookNodes(tria_node_ids); this->nodes=NULL;
         this->InitHookMatice(tria_matice_id);this->matice=NULL;
         this->InitHookMatpar(tria_matpar_id);this->matpar=NULL;
@@ -66 +63 @@
 /*}}}*/
 /*FUNCTION Tria::Update(IoModel* iomodel,int analysis_counter,int analysis_type){{{1*/
-Tria::Update(IoModel* iomodel,int analysis_counter,int analysis_type){ //i is the element index
+void Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ //i is the element index
 
         /*Intermediaries*/
@@ -85 +82 @@
 
         /*Recover nodes ids needed to initialize the node hook.*/
-        if (iomodel->analysis_type==Prognostic2AnalysisEnum || iomodel->analysis_type==Balancedthickness2AnalysisEnum){
+        if (analysis_type==Prognostic2AnalysisEnum || analysis_type==Balancedthickness2AnalysisEnum){
                 /*Discontinuous Galerkin*/
                 tria_node_ids[0]=iomodel->nodecounter+3*index+1;
@@ -214 +211 @@
 Object* Tria::copy() {
 
+        int i;
         Tria* tria=NULL;
 
@@ -231 +229 @@
 
         /*now deal with hooks and objects: */
-        tria->InitHookNodes(this->nummodels);
-        for(i=0;i<this->nummodels;i++)tria->hnodes[i].copy(&this->hnodes[i]);
+        tria->InitHookNodes(this->numanalyses);
+        for(i=0;i<this->numanalyses;i++)tria->hnodes[i].copy(&this->hnodes[i]);
         tria->hmatice.copy(&this->hmatice);
         tria->hmatpar.copy(&this->hmatpar);
@@ -279 +277 @@
         memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id);
         memcpy(&interpolation_type,marshalled_dataset,sizeof(interpolation_type));marshalled_dataset+=sizeof(interpolation_type);
-        memcpy(&nummodels,marshalled_dataset,sizeof(nummodels));marshalled_dataset+=sizeof(nummodels);
+        memcpy(&numanalyses,marshalled_dataset,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses);
 
         /*allocate dynamic memory: */
-        InitHookNodes(nummodels);
+        InitHookNodes(numanalyses);
 
         /*demarshall hooks: */
-        for(i=0;i<nummodels;i++)hnodes[i].Demarshall(&marshalled_dataset);
+        for(i=0;i<numanalyses;i++)hnodes[i].Demarshall(&marshalled_dataset);
         hmatice.Demarshall(&marshalled_dataset);
         hmatpar.Demarshall(&marshalled_dataset);
@@ -362 +360 @@
         memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id);
         memcpy(marshalled_dataset,&interpolation_type,sizeof(interpolation_type));marshalled_dataset+=sizeof(interpolation_type);
-        memcpy(marshalled_dataset,&nummodels,sizeof(nummodels));marshalled_dataset+=sizeof(nummodels);
+        memcpy(marshalled_dataset,&numanalyses,sizeof(numanalyses));marshalled_dataset+=sizeof(numanalyses);
 
         /*Marshall hooks: */
-        for(i=0;i<nummodels;i++)hnodes[i].Marshall(&marshalled_dataset);
+        for(i=0;i<numanalyses;i++)hnodes[i].Marshall(&marshalled_dataset);
         hmatice.Marshall(&marshalled_dataset);
         hmatpar.Marshall(&marshalled_dataset);
@@ -389 +387 @@
         int hnodes_size=0;;
 
-        for(i=0;i<nummodels;i++)hnodes_size+=hnodes[i].MarshallSize;
-
-        
+        for(i=0;i<numanalyses;i++)hnodes_size+=hnodes[i].MarshallSize();
+
         return sizeof(id)
                 +hnodes_size
@@ -403 +400 @@
 /*FUNCTION Tria::SpawnBeam {{{1*/
 void* Tria::SpawnBeam(int g0, int g1){
+
+        int i;
 
         /*out of grids g0,g1 and g2 from Tria, build a beam element: */
@@ -1534 +1533 @@
         /*build friction object, used later on: */
         if (drag_type!=2)ISSMERROR(" non-viscous friction not supported yet!");
-        friction=new Friction("2d",inputs,matpar);
+        friction=new Friction("2d",inputs,matpar,analysis_type);
 
         /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */
@@ -2300 +2299 @@
                 else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
         }
-        else if (analysis_type==SlopecomputeAnalysisEnum){
+        else if (analysis_type==SlopeComputeAnalysisEnum){
                 CreatePVectorSlopeCompute( pg,analysis_type,sub_analysis_type);
         }
@@ -3196 +3195 @@
         inputs->GetParameterValue(&drag_type,DragTypeEnum);
         if (drag_type!=2)ISSMERROR(" non-viscous friction not supported yet!");
-        friction=new Friction("3d",inputs,matpar);
+        friction=new Friction("3d",inputs,matpar,analysis_type);
         
         /* Ice/ocean heat exchange flux on ice shelf base */
@@ -4268 +4267 @@
         /*Build frictoin element, needed later: */
         inputs->GetParameterValue(&drag_type,DragTypeEnum);
-        friction=new Friction("2d",inputs,matpar);
+        friction=new Friction("2d",inputs,matpar,analysis_type);
 
         /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */
@@ -4423 +4422 @@
         /*Build frictoin element, needed later: */
         inputs->GetParameterValue(&drag_type,DragTypeEnum);
-        friction=new Friction("2d",inputs,matpar);
+        friction=new Friction("2d",inputs,matpar,analysis_type);
 
         /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */

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

@@ -37 +37 @@
                 /*FUNCTION constructors, destructors {{{1*/
                 Tria();
-                Tria(int tria_id,int i, IoModel* iomodel);
+                Tria(int tria_id,int i, IoModel* iomodel,int nummodels);
+                void  Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type);
                 ~Tria();
                 /*}}}*/
                 /*FUNCTION object management {{{1*/
                 void  Configure(DataSet* elements,DataSet* loads,DataSet* nodes,DataSet* materials,Parameters* parameters,int analysis_counter);
-                void  Update(IoModel* iomodel,int analysis_counter,int analysis_type);
                 Object* copy();
                 void  DeepEcho();

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

@@ -24 +24 @@
 TriaHook::TriaHook(){
         numanalyses=UNDEF;
-        this->hooks=NULL;
+        this->hnodes=NULL;
 }
 /*}}}*/

issm/trunk/src/c/objects/Loads/Icefront.cpp

@@ -41 +41 @@
 
         /*First, retrieve element index and element type: */
-        if (strcmp(iomodel->meshtype,"2d")==0){
+        if (iomodel->dim==2){
                 segment_width=4;
         }
@@ -56 +56 @@
         icefront_node_ids[1]=(int)*(iomodel->pressureload+segment_width*i+1);
 
-        if (iomodel->sub_analysis_type==HorizAnalysisEnum){
+        if (analysis_type==DiagnosticHorizAnalysisEnum){
                 if ((int)*(iomodel->elements_type+2*element+0)==MacAyealFormulationEnum){ //this is a collapsed 3d element, icefront will be 2d
                         icefront_type=SegmentIcefrontEnum;
@@ -67 +67 @@
                 else ISSMERROR(" element type %i not supported yet",(int)*(iomodel->elements_type+2*element+0));
         }
-        else if (iomodel->sub_analysis_type==StokesAnalysisEnum){
+        else if (analysis_type==DiagnosticStokesAnalysisEnum){
                 //We have a Stokes element, so we need a 3d Icefront
                 icefront_type=QuadIceFrontEnum;
@@ -108 +108 @@
         /*copy fields: */
         icefront->id=this->id;
-        icefront->analysis=this->analysis;
+        icefront->analysis_type=this->analysis_type;
         if(this->inputs){
                 icefront->inputs=(Inputs*)this->inputs->Copy();
@@ -122 +122 @@
         icefront->helement.copy(&this->helement);
         icefront->hmatpar.copy(&this->hmatpar);
-
-        /*recover objects: */
-        icefront->nodes=(Node**)icefront->hnodes.deliverp();
-        icefront->element=(Element*)icefront->helement.delivers();
-        icefront->matpar=(Matpar*)icefront->hmatpar.delivers();
 
         return icefront;

issm/trunk/src/c/objects/Loads/Numericalflux.cpp

@@ -129 +129 @@
         /*copy fields: */
         numericalflux->id=this->id;
-        numericalflux->analysis=this->analysis;
+        numericalflux->analysis_type=this->analysis_type;
         if(this->inputs){
                 numericalflux->inputs=(Inputs*)this->inputs->Copy();
@@ -141 +141 @@
         /*now deal with hooks and objects: */
         numericalflux->hnodes.copy(&this->hnodes);
-        numericalflux->helement.copy(&this->helement);
-
-        /*recover objects: */
-        numericalflux->nodes=(Node**)numericalflux->hnodes.deliverp();
-        numericalflux->element=(Element*)numericalflux->helement.delivers();
+        numericalflux->helements.copy(&this->helements);
 
         return numericalflux;

issm/trunk/src/c/objects/Loads/Pengrid.cpp

@@ -76 +76 @@
         /*copy fields: */
         pengrid->id=this->id;
-        pengrid->analysis=this->analysis;
+        pengrid->analysis_type=this->analysis_type;
         if(this->inputs){
                 pengrid->inputs=(Inputs*)this->inputs->Copy();
@@ -87 +87 @@
 
         /*now deal with hooks and objects: */
-        pengrid->hnode.copy(&this->hnodes);
+        pengrid->hnode.copy(&this->hnode);
         pengrid->helement.copy(&this->helement);
         pengrid->hmatpar.copy(&this->hmatpar);
-
-        /*recover objects: */
-        pengrid->node=(Node**)pengrid->hnode.deliverp();
-        pengrid->element=(Element*)pengrid->helement.delivers();
-        pengrid->matpar=(Matpar*)pengrid->hmatpar.delivers();
 
         //let's not forget internals
@@ -456 +451 @@
 
         //recover slope: */
-        penta->inputs->GetParameterValue(&slope[0],node,BedSlopexEnum);
-        penta->inputs->GetParameterValue(&slope[1],node,BedSlopeyEnum);
+        penta->inputs->GetParameterValue(&slope[0],node,BedSlopeXEnum);
+        penta->inputs->GetParameterValue(&slope[1],node,BedSlopeYEnum);
         
         /*recover parameters: */

issm/trunk/src/c/objects/Loads/Penpair.cpp

@@ -56 +56 @@
         /*copy fields: */
         penpair->id=this->id;
-        penpair->analysis=this->analysis;
+        penpair->analysis_type=this->analysis_type;
 
         /*now deal with hooks and objects: */
         penpair->hnodes.copy(&this->hnodes);
-
-        /*recover objects: */
-        penpair->nodes=(Node**)penpair->hnodes.deliverp();
 
         return penpair;

issm/trunk/src/c/objects/Loads/Riftfront.cpp

@@ -103 +103 @@
         /*copy fields: */
         riftfront->id=this->id;
-        riftfront->analysis=this->analysis;
+        riftfront->analysis_type=this->analysis_type;
         if(this->inputs){
                 riftfront->inputs=(Inputs*)this->inputs->Copy();
@@ -115 +115 @@
         /*now deal with hooks and objects: */
         riftfront->hnodes.copy(&this->hnodes);
-        riftfront->helement.copy(&this->helement);
+        riftfront->helements.copy(&this->helements);
         riftfront->hmatpar.copy(&this->hmatpar);
-
-        /*recover objects: */
-        riftfront->nodes=(Node**)riftfront->hnodes.deliverp();
-        riftfront->element=(Element*)riftfront->helement.delivers();
-        riftfront->matpar=(Matpar*)riftfront->hmatpar.delivers();
 
         return riftfront;

issm/trunk/src/c/objects/Materials/Matice.cpp

@@ -42 +42 @@
         double matice_B;
         double matice_n;
+        int    num_vertices;
 
         /*intermediary: */
@@ -47 +48 @@
 
         /*2d or 3d? */
-        if(strcmp(iomodel->meshtype,"2d")==0){
+        if(iomodel->dim==2){
                 num_vertices=3; //tria elements
         }
-        else if(strcmp(iomodel->meshtype,"3d")==0){
+        else if(iomodel->dim==3){
                 num_vertices=6; //penta elements
         }

issm/trunk/src/c/objects/Node.cpp

@@ -67 +67 @@
 
         /*indexing:*/
-        DistributeNumDofs(&numdofs,iomodel->analysis_type,iomodel->sub_analysis_type); //number of dofs per node
+        DistributeNumDofs(&numdofs,analysis_type); //number of dofs per node
 
         this->indexing.Init(numdofs);
@@ -74 +74 @@
         vertex_id=this->id; //node and vertex have the same id, as we are running galerkin continuous, with same number of nodes and vertices.
 
-        if (strcmp(iomodel->meshtype,"3d")==0){
+        if (iomodel->dim==3){
                 if (isnan(iomodel->uppernodes[i])){
                         upper_node_id=this->id; //nodes on surface do not have upper nodes, only themselves.
@@ -93 +93 @@
 
         /*Diagnostic Horiz*/
-        if (iomodel->analysis_type==DiagnosticAnalysisEnum && iomodel->sub_analysis_type==HorizAnalysisEnum){
-                if (strcmp(iomodel->meshtype,"3d")==0){
+        if (analysis_type==DiagnosticHorizAnalysisEnum){
+                if (iomodel->dim==3){
                         /*We have a  3d mesh, we may have collapsed elements, hence dead grids. Freeze them out: */
                         if (!iomodel->deadgrids) ISSMERROR("iomodel->deadgrids is NULL");
@@ -113 +113 @@
 
         /*Diagnostic Stokes*/
-        if (iomodel->analysis_type==DiagnosticAnalysisEnum && iomodel->sub_analysis_type==StokesAnalysisEnum){
+        if (analysis_type==DiagnosticStokesAnalysisEnum){
                 /*On a 3d mesh, in stokes formualtions, only stokes grids are free, the others are frozen: */
                 if (!iomodel->borderstokes) ISSMERROR("iomodel->borderstokes is NULL");
@@ -130 +130 @@
 
         /*Diagnostic Hutter*/
-        if (iomodel->analysis_type==DiagnosticAnalysisEnum && iomodel->sub_analysis_type==HutterAnalysisEnum){
+        if (analysis_type==DiagnosticHutterAnalysisEnum){
                 /*Spc all nodes that are not Hutter*/
                 if (!iomodel->gridonhutter) ISSMERROR("iomodel->gridonhutter is NULL");
@@ -142 +142 @@
         /*Prognostic/ Melting/ Slopecompute/ Balancedvelocities/ Balancedthickness*/
         if (
-                                iomodel->analysis_type==PrognosticAnalysisEnum || 
-                                iomodel->analysis_type==MeltingAnalysisEnum || 
-                                iomodel->analysis_type==SlopecomputeAnalysisEnum || 
-                                iomodel->analysis_type==BalancedvelocitiesAnalysisEnum || 
-                                iomodel->analysis_type==BalancedthicknessAnalysisEnum
+                                analysis_type==PrognosticAnalysisEnum || 
+                                analysis_type==MeltingAnalysisEnum || 
+                                analysis_type==SlopeComputeAnalysisEnum || 
+                                analysis_type==BalancedvelocitiesAnalysisEnum || 
+                                analysis_type==BalancedthicknessAnalysisEnum
                                 ){
-                if (strcmp(iomodel->meshtype,"3d")==0){
+                if (iomodel->dim==3){
                         /*On a 3d mesh, we may have collapsed elements, hence dead grids. Freeze them out: */
                         if (!iomodel->gridonbed) ISSMERROR("iomodel->gridonbed is NULL");
@@ -183 +183 @@
 
         /*indexing:*/
-        DistributeNumDofs(&numdofs,iomodel->analysis_type,iomodel->sub_analysis_type); //number of dofs per node
+        DistributeNumDofs(&numdofs,analysis_type); //number of dofs per node
 
         this->indexing.Init(numdofs);
@@ -191 +191 @@
         vertex_id=i+1; //matlab indexing
 
-        if (strcmp(iomodel->meshtype,"3d")==0){
+        if (iomodel->dim==3){
                 if (isnan(iomodel->uppernodes[i])){
                         upper_node_id=this->id; //nodes on surface do not have upper nodes, only themselves.

issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp

@@ -7 +7 @@
 #include "../shared.h"
 
-int DistributeNumDofs(int *pnumdofs,int analysis_type,int sub_analysis_type){
+int DistributeNumDofs(int *pnumdofs,int analysis_type){
 
         int numdofs=2; //default numdofs
@@ -13 +13 @@
 
         /*ok, according to analysis type: */
-        if (analysis_type==ControlAnalysisEnum){
-                if (sub_analysis_type==HorizAnalysisEnum){
-                        numdofs=2;
-                }
-                else if (sub_analysis_type==VertAnalysisEnum){
-                        numdofs=1;
-                }
-                else if (sub_analysis_type==StokesAnalysisEnum){
-                        numdofs=4;
-                }
-                else if (sub_analysis_type==HutterAnalysisEnum){
-                        numdofs=2;
-                }
+        if (analysis_type==DiagnosticHorizAnalysisEnum){
+                numdofs=2;
         }
-        else if (analysis_type==DiagnosticAnalysisEnum){
-                if (sub_analysis_type==HorizAnalysisEnum){
-                        numdofs=2;
-                }
-                else if (sub_analysis_type==VertAnalysisEnum){
-                        numdofs=1;
-                }
-                else if (sub_analysis_type==StokesAnalysisEnum){
-                        numdofs=4;
-                }
-                else if (sub_analysis_type==HutterAnalysisEnum){
-                        numdofs=2;
-                }
+        else if (analysis_type==DiagnosticVertAnalysisEnum){
+                numdofs=1;
         }
-        else if (analysis_type==SlopecomputeAnalysisEnum){
+        else if (analysis_type==DiagnosticStokesAnalysisEnum){
+                numdofs=4;
+        }
+        else if (analysis_type==DiagnosticHutterAnalysisEnum){
+                numdofs=2;
+        }
+        else if (analysis_type==SlopeComputeAnalysisEnum){
                 numdofs=1;
         }

issm/trunk/src/c/shared/Dofs/dofs.h

@@ -7 +7 @@
 
 double* dofsetgen(int numdofs,int* doflist,int dofspernode,int totaldofs);
-int DistributeNumDofs(int *pnumdofs,int analysis_type,int sub_analysis_type);
+int DistributeNumDofs(int *pnumdofs,int analysis_type);
 
 

issm/trunk/src/c/solutions/diagnostic.cpp

@@ -38 +38 @@
         double   start_init, finish_init;
 
-        int analyses[5]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopecomputeAnalysisEnum};
+        int analyses[5]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeComputeAnalysisEnum};
 
         MODULEBOOT();
@@ -95 +95 @@
 
                 _printf_("write results to disk:\n");
-                OutputResults(femmodel,outputfilename);
+                OutputResults(femmodel,outputfilename,DiagnosticAnalysisEnum);
         }
         else{

issm/trunk/src/c/solutions/solutions.h

@@ -13 +13 @@
 
 /*cores: */
-Results* gradjcompute_core(Model* model);
-void* diagnostic_core(Model* model);
-Results* prognostic_core(Model* model);
-Results* prognostic2_core(Model* model);
-Results* balancedthickness_core(Model* model);
-Results* balancedthickness2_core(Model* model);
-Results* balancedvelocities_core(Model* model);
-Results* slopecompute_core(Model* model);
-Results* control_core(Model* model);
-Results* steadystate_core(Model* model);
-Results* transient_core(Model* model);
-Results* transient_core_2d(Model* model);
-Results* transient_core_3d(Model* model);
-Results* thermal_core(Model* model);
+Results* gradjcompute_core(FemModel* model);
+void* diagnostic_core(FemModel* model);
+Results* prognostic_core(FemModel* model);
+Results* prognostic2_core(FemModel* model);
+Results* balancedthickness_core(FemModel* model);
+Results* balancedthickness2_core(FemModel* model);
+Results* balancedvelocities_core(FemModel* model);
+Results* slopecompute_core(FemModel* model);
+Results* control_core(FemModel* model);
+Results* steadystate_core(FemModel* model);
+Results* transient_core(FemModel* model);
+Results* transient_core_2d(FemModel* model);
+Results* transient_core_3d(FemModel* model);
+Results* thermal_core(FemModel* model);
 void slope_core(FemModel* fem,int sub_analysis_type);
 
@@ -51 +51 @@
 void WriteLockFile(char* filename);
 
-void ControlInitialization(Model* model);
-void ControlRestart(Model* model,double* param_g);
+void ControlInitialization(FemModel* model);
+void ControlRestart(FemModel* model,double* param_g);
 
 void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type);

issm/trunk/src/c/toolkits/metis/metisincludes.h

@@ -9 +9 @@
 #include <metis.h>
 
-extern "C" void METIS_PartMeshNodal(int *, int *, idxtype *, int *, int *, int *, int *, idxtype *, idxtype *);
+void METIS_PartMeshNodal(int *, int *, idxtype *, int *, int *, int *, int *, idxtype *, idxtype *);
 
 #endif