Changeset 22443


Ignore:
Timestamp:
02/21/18 14:58:05 (7 years ago)
Author:
erobo
Message:

CHG/ADD: new adm1qn3inversion m class and modify files to make ad/m1qn3 work

Location:
issm/trunk-jpl/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r22428 r22443  
    283283                                        ./cores/controlad_core.cpp\
    284284                                        ./cores/controlm1qn3_core.cpp\
     285                                        ./cores/controladm1qn3_core.cpp\
    285286                                        ./cores/controlvalidation_core.cpp\
    286287                                        ./cores/adjointstressbalance_core.cpp\

  • issm/trunk-jpl/src/c/cores/WrapperCorePointerFromSolutionEnum.cpp

    r18888 r22443  
    4747                        case 2: solutioncore=controlm1qn3_core; break;
    4848                        case 3: solutioncore=controlvalidation_core; break;
    49                         case 4: solutioncore=controlad_core; break;
     49                        case 4: solutioncore=controladm1qn3_core; break;
    5050                        default: _error_("control type not supported");
    5151                }

  • issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp

    r22439 r22443  
    1 /*!\file: controlm1qn3_core.cpp
     1/*!\file: controladm1qn3_core.cpp
    22 * \brief: core of the control solution
    33 */
    … …  
    315315
    316316}/*}}}*/
    317 void controlm1qn3_core(FemModel* femmodel){/*{{{*/
     317void controladm1qn3_core(FemModel* femmodel){/*{{{*/
    318318
    319319        /*Intermediaries*/
    … …  
    467467
    468468#else
    469 void controlm1qn3_core(FemModel* femmodel){_error_("M1QN3 not installed");}
     469void controladm1qn3_core(FemModel* femmodel){_error_("M1QN3 not installed");}
    470470#endif //_HAVE_M1QN3_

  • issm/trunk-jpl/src/c/cores/cores.h

    r22004 r22443  
    3030void controltao_core(FemModel* femmodel);
    3131void controlm1qn3_core(FemModel* femmodel);
     32void controladm1qn3_core(FemModel* femmodel);
    3233void controlad_core(FemModel* femmodel);
    3334void controlvalidation_core(FemModel* femmodel);

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

    r22266 r22443  
    102102                                parameters->AddObject(new DoubleVecParam(InversionControlScalingFactorsEnum,control_scaling_factors,num_controls));
    103103                                break;
    104                         case 4:/*M1QN3 AD*/
     104                        case 4:/*AD M1QN3*/
    105105                                parameters->AddObject(iomodel->CopyConstantObject("md.inversion.dxmin",InversionDxminEnum));
    106106                                parameters->AddObject(iomodel->CopyConstantObject("md.inversion.gttol",InversionGttolEnum));
Note: See TracChangeset for help on using the changeset viewer.