Changeset 14977


Ignore:
Timestamp:
05/09/13 02:01:53 (12 years ago)
Author:
Eric.Larour
Message:

CHG: moved OptPars and OptArgs to shared/Numerics, to break the dependency
of BrentSearch on objects.h

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

Legend:

Unmodified
Added
Removed

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

    r14975 r14977  
    3333                                        ./classes/objects/Load.h\
    3434                                        ./classes/objects/Contour.h\
    35                                         ./classes/objects/OptArgs.h\
    36                                         ./classes/objects/OptPars.h\
    3735                                        ./classes/objects/Loads/Friction.h\
    3836                                        ./classes/objects/Loads/Friction.cpp\
    … …  
    209207                                        ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\
    210208                                        ./shared/Numerics/UnitConversion.cpp\
     209                                        ./shared/Numerics/OptArgs.h\
     210                                        ./shared/Numerics/OptPars.h\
    211211                                        ./shared/Exceptions/exceptions.h\
    212212                                        ./shared/Exceptions/Exceptions.cpp\

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

    r14897 r14977  
    3232#include "./FemModel.h"
    3333#include "./GiaDeflectionCoreArgs.h"
    34 #include "./OptArgs.h"
    35 #include "./OptPars.h"
    3634#include "./AdolcEdf.h"
    3735#include "./ToolkitOptions.h"

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

    r14967 r14977  
    1414class Parameters;
    1515class Inputs;
     16class Input;
    1617class IoModel;
    1718class Node;

  • issm/trunk-jpl/src/c/shared/Numerics/OptArgs.h

    r14973 r14977  
    66#define _OPTARGS_H_
    77
    8 class Model;
     8class FemModel;
     9
    910struct OptArgs{
    1011        FemModel* femmodel;

  • issm/trunk-jpl/src/c/shared/Numerics/OptPars.h

    r14973 r14977  
    55#ifndef _OPTPARS_H_
    66#define _OPTPARS_H_
     7
     8#include "./types.h"
    79
    810struct OptPars{

  • issm/trunk-jpl/src/c/shared/Numerics/numerics.h

    r14975 r14977  
    1212#include "./types.h"
    1313#include "./constants.h"
    14 
    15 class Input;
    16 class Parameters;
    17 
    18 struct OptArgs;
    19 struct OptPars;
     14#include "./OptArgs.h"
     15#include "./OptPars.h"
    2016
    2117IssmDouble  min(IssmDouble a,IssmDouble b);
Note: See TracChangeset for help on using the changeset viewer.