Changeset 10970


Ignore:
Timestamp:
11/29/11 16:04:20 (13 years ago)
Author:
Mathieu Morlighem
Message:

Improvement: do not load control parameters if iscontrol=0

Location:
issm/trunk-jpl/src/c
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

    r9733 r10970  
    2929        iomodel->Constant(&numberofelements,MeshNumberofelementsEnum);
    3030        iomodel->Constant(&control_analysis,InversionIscontrolEnum);
    31         iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
     31        if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
    3232
    3333        /*Now, return if no control*/

  • issm/trunk-jpl/src/c/objects/Elements/Penta.cpp

    r10830 r10970  
    15971597        iomodel->Constant(&yts,ConstantsYtsEnum);
    15981598        iomodel->Constant(&control_analysis,InversionIscontrolEnum);
    1599         iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
    1600         iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum);
     1599        if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
     1600        if(control_analysis) iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum);
    16011601
    16021602        /*Checks if debuging*/

  • issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

    r10931 r10970  
    14431443   
    14441444        /*Get parameters: */
     1445        iomodel->Constant(&yts,ConstantsYtsEnum);
    14451446        iomodel->Constant(&control_analysis,InversionIscontrolEnum);
    1446         iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
    1447         iomodel->Constant(&yts,ConstantsYtsEnum);
    1448         iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum);
     1447        if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
     1448        if(control_analysis) iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum);
    14491449
    14501450        /*Recover vertices ids needed to initialize inputs*/

  • issm/trunk-jpl/src/c/objects/Materials/Matice.cpp

    r10576 r10970  
    669669        iomodel->Constant(&dim,MeshDimensionEnum);
    670670        iomodel->Constant(&control_analysis,InversionIscontrolEnum);
    671         iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
     671        if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum);
    672672
    673673        /*if 2d*/
Note: See TracChangeset for help on using the changeset viewer.