Changeset 4001

Timestamp:

06/02/10 16:25:39 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor fixing, still not compiling

Location:

issm/trunk/src/c

Files:

• modules/SpcNodesx/SpcNodesx.cpp (modified) (3 diffs)
• modules/SpcNodesx/SpcNodesx.h (modified) (1 diff)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Tria.h (modified) (1 diff)
• objects/FemModel.cpp (modified) (9 diffs)
• objects/FemModel.h (modified) (2 diffs)
• objects/objects.h (modified) (1 diff)

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

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void SpcNodesx( DofVec** pyg, DataSet* nodes,DataSet* constraints){
+void SpcNodesx(Vec* pyg, DataSet* nodes,DataSet* constraints){
 
         int i;
@@ -17 +17 @@
 
         /*output: */
-        DofVec* yg=NULL;
+        Vec* yg=NULL;
 
         /*First, recover number of dofs from nodes: */
@@ -24 +24 @@
         if(numberofdofs){
                 
-                /*Allocate dofvec: */
-                yg=new DofVec("yg");
-                yg->numdofs=numberofdofs;
-
                 /*Allocate yg: */
-                yg->vector=NewVec(numberofdofs);
+                yg=NewVec(numberofdofs);
 
                 /*Now, go through constraints, and update the nodes and the constraint vector at the same time: */
-                constraints->SetupSpcs(nodes,yg->vector);
+                constraints->SetupSpcs(nodes,yg);
 
                 /*Specify numentries: */
                 VecGetSize(yg->vector,&gsize);
-                yg->numentries=(int)gsize/yg->numdofs;
-        }
-        else{
-                /*Allocate dofvec: */
-                yg=new DofVec("yg");
         }
 

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

@@ -11 +11 @@
 
 /* local prototypes: */
-void SpcNodesx( DofVec** pyg, DataSet* nodesin,DataSet* constraints);
+void SpcNodesx(Vec* pyg, DataSet* nodesin,DataSet* constraints);
 
 #endif  /* _SPCNODESX_H */
-

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

@@ -43 +43 @@
                 Penta();
                 Penta(int penta_id,int i, IoModel* iomodel,int nummodels);
-                Update(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/Tria.h

@@ -38 +38 @@
                 Tria();
                 Tria(int tria_id,int i, IoModel* iomodel);
-                Update(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);
+                void  Update(IoModel* iomodel,int analysis_counter,int analysis_type);
                 Object* copy();
                 void  DeepEcho();

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

@@ -22 +22 @@
 /*FUNCTION FemModel::constructor {{{1*/
 FemModel::FemModel(int in_nummodels){
+
+        /*intermediary*/
+        int i;
 
         nummodels=in_nummodels;
@@ -50 +53 @@
 FemModel::~FemModel(){
 
+        /*Intermediary*/
         int i;
 
@@ -89 +93 @@
 /*Object management*/
 /*FUNCTION FemModel::Echo {{{1*/
-
 void FemModel::Echo(void){
 
@@ -95 +98 @@
         printf("   number of fem models: %i\n",nummodels);
         printf("   analysis_type_list: \n");
-        for(i=0;i<nummodels;i++)printf("     %i: %s\n",i,EnumAsString(analysis_type_list[i]));
+        for(int i=0;i<nummodels;i++)printf("     %i: %s\n",i,EnumAsString(analysis_type_list[i]));
         printf("   current analysis_type: \n");
-        printf("     %i: %s\n",i,EnumAsString(analysis_type_list[analysis_counter]));
+        printf("     %i: %s\n",analysis_counter,EnumAsString(analysis_type_list[analysis_counter]));
 
 
 }
-/*}}}1*/
+/*}}}*/
 
 /*Numerics: */
@@ -112 +115 @@
 
         /*intermediary: */
-        IoFemModel* iomodel=NULL;
+        IoModel* iomodel=NULL;
         
         _printf_("   fill model with matlab workspace data\n");
-        iomodel=new IoFemModel(IOMODEL);
+        iomodel = new IoModel(IOMODEL);
 
         _printf_("   create datasets:\n");
@@ -133 +136 @@
 
         _printf_("   reducing single point constraints vector:\n");
-        Reducevectorgtosx(&ys[analysis_counter], yg[analysis_counter]->vector,nodesets[analysis_counter]);
+        Reducevectorgtosx(&ys[analysis_counter], yg[analysis_counter],nodesets[analysis_counter]);
         
         _printf_("   normalizing rigid body constraints matrix:\n");
@@ -149 +152 @@
 /*}}}1*/
 /*FUNCTION FemModel::GetCurrentAnalysis {{{1*/
-FemFemModel* FemModel::GetCurrentAnalysis(){
+int FemModel::GetCurrentAnalysis(){
         return analysis_type_list[analysis_counter];
 }
@@ -156 +159 @@
 void FemModel::SetCurrentAnalysis(int analysis_type){
         int found=-1;
-        for(i=0;i<nummodels;i++){
+        for(int i=0;i<nummodels;i++){
                 if (analysis_type_list[i]==analysis_type){
                         found=i;
@@ -162 +165 @@
                 }
         }
-        if(found)analysis_counter=i;
-        else ISSMERRR("%s%s%s"," could not find analysis_type ",EnumAsString(analysis_type) " in list of FemModel analyses");
+        if(found!=-1) analysis_counter=found;
+        else ISSMERROR("Could not find analysis_type %s in list of FemModel analyses",EnumAsString(analysis_type));
 }
 /*}}}1*/

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

@@ -42 +42 @@
                 Mat*                 Gmn;
                 NodeSets**           nodesets; //boundary conditions dof sets
-                Vec*             yg; //boundary conditions in global g-set
+                Vec*                 yg; //boundary conditions in global g-set
                 Vec*                 ys; //boundary conditions, in reduced s-set
 
@@ -50 +50 @@
 
                 /*Methods: */
-                Echo();
+                void Echo();
 
                 /*Fem: */
                 void  AddAnalysis(ConstDataHandle IOMODEL, int analysis_type);
-                int   SetCurrentAnalysis(int analysis_type);
-                void  GetCurrentAnalysis(void);
+                void  SetCurrentAnalysis(int analysis_type);
+                int   GetCurrentAnalysis(void);
 
 };
 
-
 #endif

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

@@ -15 +15 @@
 #include "./Node.h"
 #include "./NodeSets.h"
-#include "./Model.h"
 #include "./Result.h"
 #include "./IoModel.h"