Changeset 22536


Ignore:
Timestamp:
03/13/18 14:53:54 (7 years ago)
Author:
erobo
Message:

FIX: fix for ad nightly tests to work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

    r22517 r22536  
    131131void UpdateElementsAndMaterialsControl(Elements* elements,Materials* materials, IoModel* iomodel){
    132132
     133
    133134        /*Intermediaries*/
    134135        int                             num_independent_objects,M,N;
     
    138139        IssmDouble**    independents_min                        = NULL;
    139140        IssmDouble**    independents_max                        = NULL;
     141        bool                            control_analysis                        =false;
     142
     143        iomodel->FindConstant(&control_analysis,"md.inversion.iscontrol");
     144       
     145        /*Now, return if no control*/
     146        if(!control_analysis) return;
    140147
    141148        /*Step1: create controls (independents)*/
    142149        iomodel->FetchData(&num_independent_objects,"md.autodiff.num_independent_objects");
    143 //_assert_(num_independent_objects>0);
     150        _assert_(num_independent_objects>0);
    144151        iomodel->FetchData(&names,&M,"md.autodiff.independent_object_names");
    145152        _assert_(M==num_independent_objects);
Note: See TracChangeset for help on using the changeset viewer.