Changeset 4118


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

    r4034 r4118  
    3939                node=(Node*)nodes->GetObjectByOffset(i);
    4040                if(node->InAnalysis(analysis_type)){
    41                                 node->Configure(nodes,vertices);
     41                        node->Configure(nodes,vertices);
    4242                }
    4343        }
  • TabularUnified issm/trunk/src/c/objects/Elements/Tria.cpp

    r4091 r4118  
    320320/*}}}*/
    321321/*FUNCTION Tria::DeepEcho{{{1*/
    322 
    323322void Tria::DeepEcho(void){
    324323
     
    353352/*}}}*/
    354353/*FUNCTION Tria::Echo{{{1*/
    355 
    356354void Tria::Echo(void){
    357         this->DeepEcho();
     355        printf("Tria:\n");
     356        printf("   id: %i\n",id);
     357        if(nodes){
     358                nodes[0]->Echo();
     359                nodes[1]->Echo();
     360                nodes[2]->Echo();
     361        }
     362        else printf("nodes = NULL\n");
     363
     364        if (matice) matice->Echo();
     365        else printf("matice = NULL\n");
     366
     367        if (matpar) matpar->Echo();
     368        else printf("matpar = NULL\n");
     369
     370        printf("   parameters\n");
     371        if (parameters) parameters->Echo();
     372        else printf("parameters = NULL\n");
     373
     374        printf("   inputs\n");
     375        if (inputs) inputs->Echo();
     376        else printf("inputs=NULL\n");
     377
     378        if (results) results->Echo();
     379        else printf("results=NULL\n");
    358380}
    359381/*}}}*/
     
    729751void  Tria::GetSolutionFromInputs(Vec solution){
    730752
    731         int analysis_type,sub_analysis_type;
     753        int analysis_type;
    732754
    733755        /*retrive parameters: */
    734756        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    735         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
    736757       
    737758        /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
    738         if (analysis_type==DiagnosticAnalysisEnum){
    739                 if (sub_analysis_type==HorizAnalysisEnum){
    740                         GetSolutionFromInputsDiagnosticHoriz(solution);
    741                 }
    742                 else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
    743         }
    744         else{
    745                 ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
    746         }
     759        if (analysis_type==DiagnosticHorizAnalysisEnum)
     760                GetSolutionFromInputsDiagnosticHoriz(solution);
     761        else
     762         ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
     763
    747764}
    748765/*}}}*/
     
    37963813        int numberofdofspernode;
    37973814
     3815        /*Some checks for debugging*/
     3816        ISSMASSERT(doflist);
     3817        ISSMASSERT(pnumberofdofspernode);
     3818        ISSMASSERT(nodes);
     3819
     3820        /*Build doflist from nodes*/
    37983821        for(i=0;i<3;i++){
    37993822                nodes[i]->GetDofList(&doflist_per_node[0],&numberofdofspernode);
  • TabularUnified issm/trunk/src/c/objects/Node.cpp

    r4117 r4118  
    247247        hupper_node.Echo();
    248248        printf("   inputs\n");
    249         inputs->DeepEcho();
     249        inputs->Echo();
    250250
    251251
     
    371371/*FUNCTION Node::InAnalysis(int analysis_type){{{2*/
    372372bool Node::InAnalysis(int in_analysis_type){
    373         if (in_analysis_type=this->analysis_type)return true;
     373        if (in_analysis_type==this->analysis_type) return true;
    374374        else return false;
    375375}
Note: See TracChangeset for help on using the changeset viewer.