Changeset 9789


Ignore:
Timestamp:
09/13/11 09:47:55 (14 years ago)
Author:
Mathieu Morlighem
Message:

moved flags from qmu and control to general parameters

Location:
issm/trunk/src/c/modules/ModelProcessorx
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

    r9681 r9789  
    3131        /*retrieve some parameters: */
    3232        iomodel->Constant(&control_analysis,InversionIscontrolEnum);
    33         parameters->AddObject(new BoolParam(InversionIscontrolEnum,control_analysis));
    3433
    3534        if(control_analysis){

  • issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r9761 r9789  
    7878        parameters->AddObject(iomodel->CopyConstantObject(AutodiffForwardEnum));
    7979        parameters->AddObject(iomodel->CopyConstantObject(AutodiffReverseEnum));
     80        parameters->AddObject(iomodel->CopyConstantObject(QmuIsdakotaEnum));
     81        parameters->AddObject(iomodel->CopyConstantObject(InversionIscontrolEnum));
    8082
    8183        /*some parameters that did not come with the iomodel: */

  • issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

    r9725 r9789  
    6464        /*recover parameters: */
    6565        iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
    66         parameters->AddObject(new BoolParam(QmuIsdakotaEnum,dakota_analysis));
    6766
    6867        if(dakota_analysis){
Note: See TracChangeset for help on using the changeset viewer.