Changeset 9298

Timestamp:

08/11/11 15:16:35 (14 years ago)

Author:

Mathieu Morlighem

Message:

added UpdateDynamic

Location:

issm/trunk/src

Files:

• c/Container/DataSet.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/SpcNodesx/SpcNodesx.cpp (modified) (1 diff)
• c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (modified) (1 diff)
• c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h (modified) (1 diff)
• c/objects/Constraints/SpcDynamic.cpp (modified) (8 diffs)
• c/objects/Constraints/SpcDynamic.h (modified) (3 diffs)
• c/solutions/ResetBoundaryConditions.cpp (modified) (2 diffs)
• m/solutions/ResetBoundaryConditions.m (modified) (1 diff)
• mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp (modified) (3 diffs)
• mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h (modified) (2 diffs)

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

@@ -448 +448 @@
 void DataSet::Echo(){
 
-
         vector<Object*>::iterator object;
 
@@ -493 +492 @@
         int i;
 
+        _assert_(this);
         if(!sorted)_error_(" trying to binary search on a non-sorted dataset!");
 

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp ¶

@@ -167 +167 @@
                         /*Now add the regular spcs*/
                         else{
-                                if (!isnan(iomodel->spcvx[i]) || (int)iomodel->nodeonhutter[i]){
+                                if (!isnan(iomodel->spcvx[i])){
                                         constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,iomodel->spcvx[i]/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
                                         count++;
                                 }
+                                else if (iomodel->nodeonhutter[i]){
+                                        constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,DiagnosticHorizAnalysisEnum)); 
+                                        count++;
+                                }
                                 
-                                if (!isnan(iomodel->spcvy[i]) || (int)iomodel->nodeonhutter[i]){
-                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,iomodel->spcvy[i]/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy
-                                        count++;
-                                }
+                                if (!isnan(iomodel->spcvy[i])){
+                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,iomodel->spcvy[i]/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vy.
+                                        count++;
+                                }
+                                else if (iomodel->nodeonhutter[i]){
+                                        constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,DiagnosticHorizAnalysisEnum)); 
+                                        count++;
+                                }
+
                                 if (!isnan(iomodel->spcvz[i]) && ((int)iomodel->vertices_type[i]==StokesApproximationEnum ||  ((int)iomodel->vertices_type[i]==NoneApproximationEnum))){
                                         constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,iomodel->spcvz[i]/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy

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

@@ -12 +12 @@
 void SpcNodesx(Nodes* nodes,Constraints* constraints,Parameters* parameters, int analysis_type){
 
-        int i;
-                        
-        for(i=0;i<constraints->Size();i++){
+        for(int i=0;i<constraints->Size();i++){
         
                 Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i);

issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp ¶

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void UpdateDynamicConstraintsx(Nodes* nodes,Parameters* parameters,Vec ys){
+void UpdateDynamicConstraintsx(Constraints* constraints,Nodes* nodes,Parameters* parameters,Vec yg){
         
-        int i;
         int configuration_type;
-        double* ys_serial=NULL;
+        double* yg_serial=NULL;
 
-        /*retrieve parameters: */
+        /*Get current configuration*/
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
-        if(nodes->NumberOfNodes(configuration_type)){ 
+        /*serialize yg, so nodes can index into it: */
+        VecToMPISerial(&yg_serial,yg);
 
-                /*serialize ys, so nodes can index into it: */
-                VecToMPISerial(&ys_serial,ys);
+        for(int i=0;i<constraints->Size();i++){
 
-                /*Go through all nodes, and ask them to retrieve values from ys and then update their spc values :*/
-                for(i=0;i<nodes->Size();i++){
+                Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i);
 
-                        Node* node=(Node*)nodes->GetObjectByOffset(i);
+                /*Check this constraint belongs to this analysis: */
+                if(constraint->InAnalysis(configuration_type) && constraint->Enum()==SpcDynamicEnum){
 
-                        /*Check that this node corresponds to our analysis currently being carried out: */
-                        if (node->InAnalysis(configuration_type)){
+                        ((SpcDynamic*)constraint)->SetDynamicConstraint(nodes,yg_serial);
 
-                                /*For this object, reset values of spc fields in the node: */
-                                node->UpdateSpcs(ys_serial);
-                        }
                 }
         }
 
         /*Free ressources:*/
-        xfree((void**)&ys_serial);
+        xfree((void**)&yg_serial);
 }

issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h ¶

@@ -9 +9 @@
 #include "../../objects/objects.h"
 
-void UpdateDynamicConstraintsx(Nodes* nodes,Parameters* parameters,Vec ys);
+void UpdateDynamicConstraintsx(Constraints* constraints,Nodes* nodes,Parameters* parameters,Vec yg);
 
 #endif  /* _UPDATESPCSX_H */

issm/trunk/src/c/objects/Constraints/SpcDynamic.cpp ¶

@@ -24 +24 @@
 /*}}}1*/
 /*FUNCTION SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid,...){{{1*/
-SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){
+SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid, int spc_dof,int spc_analysis_type){
 
         sid=spc_sid;
         nodeid=spc_nodeid;
         dof=spc_dof;
-        value=spc_value;
+        value=0;
         analysis_type=spc_analysis_type;
+        isset=false;
 
         return;
@@ -50 +51 @@
         printf("   dof: %i\n",dof);
         printf("   value: %g\n",value);
+        printf("   isset: %s\n",isset?"true":"false");
         printf("   analysis_type: %s\n",EnumToStringx(analysis_type));
         return;
@@ -57 +59 @@
 void SpcDynamic::DeepEcho(void){
 
-        printf("SpcDynamic:\n");
-        printf("   sid: %i\n",sid);
-        printf("   nodeid: %i\n",nodeid);
-        printf("   dof: %i\n",dof);
-        printf("   value: %g\n",value);
-        printf("   analysis_type: %s\n",EnumToStringx(analysis_type));
+        this->Echo();
         return;
 }               
@@ -95 +92 @@
         memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof);
         memcpy(marshalled_dataset,&value,sizeof(value));marshalled_dataset+=sizeof(value);
+        memcpy(marshalled_dataset,&isset,sizeof(isset));marshalled_dataset+=sizeof(isset);
         memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
 
@@ -108 +106 @@
                 +sizeof(dof)
                 +sizeof(value)
+                +sizeof(isset)
                 +sizeof(analysis_type)
                 +sizeof(int); //sizeof(int) for enum type
@@ -127 +126 @@
         memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof);
         memcpy(&value,marshalled_dataset,sizeof(value));marshalled_dataset+=sizeof(value);
+        memcpy(&isset,marshalled_dataset,sizeof(isset));marshalled_dataset+=sizeof(isset);
         memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
 
@@ -164 +164 @@
         /*Apply constraint: */
         if(node){ //in case the spc is dealing with a node on another cpu
+
+                /*We should first check that the value has been set... (test306)*/
                 node->ApplyConstraint(dof,value);
         }
@@ -183 +185 @@
 /*FUNCTION SpcDynamic::GetValue {{{1*/
 double SpcDynamic::GetValue(){
+        _assert_(this->isset);
         _assert_(!isnan(value));
         return value;
 }
 /*}}}1*/
+/*FUNCTION SpcDynamic::SetDynamicConstraint {{{1*/
+void SpcDynamic::SetDynamicConstraint(Nodes* nodes,double* yg_serial){
+
+        int pos;
+
+        Node* node=(Node*)nodes->GetObjectById(NULL,nodeid);
+        pos=node->GetDof(dof,GsetEnum);
+
+        this->value=yg_serial[pos];
+        this->isset=true;
+}
+/*}}}1*/

issm/trunk/src/c/objects/Constraints/SpcDynamic.h ¶

@@ -19 +19 @@
                 int dof; /*!component*/
                 double value; /*value*/
+                bool isset;
                 int analysis_type;
 
@@ -25 +26 @@
                 /*SpcDynamic constructors, destructors:{{{1*/
                 SpcDynamic();
-                SpcDynamic(int sid,int nodeid, int dof,double value,int analysis_type);
+                SpcDynamic(int sid,int nodeid, int dof,int analysis_type);
                 ~SpcDynamic();
                 /*}}}*/
@@ -47 +48 @@
                 int    GetDof();
                 double GetValue();
+                void   SetDynamicConstraint(Nodes* nodes,double *yg_serial);
                 /*}}}*/
 

issm/trunk/src/c/solutions/ResetBoundaryConditions.cpp ¶

@@ -10 +10 @@
         
         /*variables: */
-        Vec yg=NULL;
-        Vec ys=NULL;
-        Nodes* nodes=NULL;
-        int i;
+        Vec    yg    = NULL;
+        Nodes *nodes = NULL;
+        int    i;
 
         _printf_(VerboseSolution(),"%s\n","   updating boundary conditions...");
@@ -25 +24 @@
         /*retrieve boundary conditions from element inputs :*/
         GetSolutionFromInputsx( &yg, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,  femmodel->parameters);
-        Reducevectorgtosx(&ys,yg,femmodel->nodes,femmodel->parameters);
 
         /*update spcs using this new vector of constraints: */
-        UpdateDynamicConstraintsx(femmodel->nodes,femmodel->parameters,ys);
+        UpdateDynamicConstraintsx(femmodel->constraints,femmodel->nodes,femmodel->parameters,yg);
 
         /*Free ressources:*/
-        VecFree(&ys);
         VecFree(&yg);
 }

issm/trunk/src/m/solutions/ResetBoundaryConditions.m ¶

@@ -14 +14 @@
         %recreate constraints vector for the current analysis
         ug=GetSolutionFromInputs(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-        ys=Reducevectorgtos(ug,femmodel.nodes,femmodel.parameters);
 
         %update values of spcs inside nodes
-        femmodel.nodes=UpdateDynamicConstraints(femmodel.nodes,femmodel.parameters,ys);
+        femmodel.nodes=UpdateDynamicConstraints(femmodel.constraints,femmodel.nodes,femmodel.parameters,ug);

issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp ¶

@@ -8 +8 @@
 
         /*input datasets: */
-        Nodes* nodes=NULL;
-        Parameters* parameters=NULL;
-        Vec ys=NULL;
+        Constraints *constraints = NULL;
+        Nodes       *nodes       = NULL;
+        Parameters  *parameters  = NULL;
+        Vec          yg          = NULL;
 
         /*Boot module: */
@@ -19 +20 @@
 
         /*Input datasets: */
+        FetchMatlabData((DataSet**)&constraints,CONSTRAINTSIN);
         FetchMatlabData((DataSet**)&nodes,NODESIN);
         FetchMatlabData((Parameters**)&parameters,PARAMETERS);
-        FetchMatlabData(&ys,YS);
+        FetchMatlabData(&yg,YS);
         
         /*!Generate internal degree of freedom numbers: */
-        UpdateDynamicConstraintsx(nodes,parameters,ys);
+        UpdateDynamicConstraintsx(constraints,nodes,parameters,yg);
 
         /*write output datasets: */
@@ -30 +32 @@
 
         /*Free ressources: */
+        VecFree(&yg);
+        delete constraints;
         delete nodes;
         delete parameters;

issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h ¶

@@ -17 +17 @@
 
 /* serial input macros: */
-#define NODESIN (mxArray*)prhs[0]
-#define PARAMETERS (mxArray*)prhs[1]
-#define YS (mxArray*)prhs[2]
+#define CONSTRAINTSIN (mxArray*)prhs[0]
+#define NODESIN (mxArray*)prhs[1]
+#define PARAMETERS (mxArray*)prhs[2]
+#define YS (mxArray*)prhs[3]
 
 /* serial output macros: */
@@ -28 +29 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  3
+#define NRHS  4
 
 #endif  /* _UPDATESPCS_H */