Changeset 4118

Timestamp:

06/22/10 13:54:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed some bug in element configuration

Location:

issm/trunk/src/c

Files:

• modules/ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (4 diffs)
• objects/Node.cpp (modified) (2 diffs)

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

@@ -39 +39 @@
                 node=(Node*)nodes->GetObjectByOffset(i);
                 if(node->InAnalysis(analysis_type)){
-                                node->Configure(nodes,vertices);
+                        node->Configure(nodes,vertices);
                 }
         }

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

@@ -320 +320 @@
 /*}}}*/
 /*FUNCTION Tria::DeepEcho{{{1*/
-
 void Tria::DeepEcho(void){
 
@@ -353 +352 @@
 /*}}}*/
 /*FUNCTION Tria::Echo{{{1*/
-
 void Tria::Echo(void){
-        this->DeepEcho();
+        printf("Tria:\n");
+        printf("   id: %i\n",id);
+        if(nodes){
+                nodes[0]->Echo();
+                nodes[1]->Echo();
+                nodes[2]->Echo();
+        }
+        else printf("nodes = NULL\n");
+
+        if (matice) matice->Echo();
+        else printf("matice = NULL\n");
+
+        if (matpar) matpar->Echo();
+        else printf("matpar = NULL\n");
+
+        printf("   parameters\n");
+        if (parameters) parameters->Echo();
+        else printf("parameters = NULL\n");
+
+        printf("   inputs\n");
+        if (inputs) inputs->Echo();
+        else printf("inputs=NULL\n");
+
+        if (results) results->Echo();
+        else printf("results=NULL\n");
 }
 /*}}}*/
@@ -729 +751 @@
 void  Tria::GetSolutionFromInputs(Vec solution){
 
-        int analysis_type,sub_analysis_type;
+        int analysis_type;
 
         /*retrive parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-        parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
         
         /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
-        if (analysis_type==DiagnosticAnalysisEnum){
-                if (sub_analysis_type==HorizAnalysisEnum){
-                        GetSolutionFromInputsDiagnosticHoriz(solution);
-                }
-                else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
-        }
-        else{
-                ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
-        }
+        if (analysis_type==DiagnosticHorizAnalysisEnum)
+                GetSolutionFromInputsDiagnosticHoriz(solution);
+        else
+         ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
+
 }
 /*}}}*/
@@ -3796 +3813 @@
         int numberofdofspernode;
 
+        /*Some checks for debugging*/
+        ISSMASSERT(doflist);
+        ISSMASSERT(pnumberofdofspernode);
+        ISSMASSERT(nodes);
+
+        /*Build doflist from nodes*/
         for(i=0;i<3;i++){
                 nodes[i]->GetDofList(&doflist_per_node[0],&numberofdofspernode);

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

@@ -247 +247 @@
         hupper_node.Echo();
         printf("   inputs\n");
-        inputs->DeepEcho();
+        inputs->Echo();
 
 
@@ -371 +371 @@
 /*FUNCTION Node::InAnalysis(int analysis_type){{{2*/
 bool Node::InAnalysis(int in_analysis_type){
-        if (in_analysis_type=this->analysis_type)return true;
+        if (in_analysis_type==this->analysis_type) return true;
         else return false;
 }