Changeset 11808


Ignore:
Timestamp:
03/29/12 11:09:38 (14 years ago)
Author:
Mathieu Morlighem
Message:

renamed objectivefunctionC -> objectivefunction

Location:
issm/trunk-jpl/src/c
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

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

    r11735 r11808  
    448448                                          ./solutions/controlrestart.cpp\
    449449                                          ./solutions/controlconvergence.cpp\
    450                                           ./solutions/objectivefunctionC.cpp\
     450                                          ./solutions/objectivefunction.cpp\
    451451                                          ./solutions/gradient_core.cpp\
    452452                                          ./solutions/adjointdiagnostic_core.cpp\

  • issm/trunk-jpl/src/c/solutions/control_core.cpp

    r11317 r11808  
    9999                _printf_(VerboseControl(),"%s\n","   optimizing along gradient direction");
    100100                optpars.maxiter=(int)maxiter[n]; optpars.cm_jump=cm_jump[n];
    101                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
     101                BrentSearch(&search_scalar,J+n,&optpars,&objectivefunction,&optargs);
    102102
    103103                _printf_(VerboseControl(),"%s\n","   updating parameter using optimized search scalar"); //true means update save controls

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

    r11679 r11808  
    3232void steadystate_core(FemModel* femmodel);
    3333void transient_core(FemModel* femmodel);
    34 double objectivefunctionC(double search_scalar,OptArgs* optargs);
     34double objectivefunction(double search_scalar,OptArgs* optargs);
    3535
    3636//convergence:
Note: See TracChangeset for help on using the changeset viewer.