Changeset 22441


Ignore:
Timestamp:
02/21/18 13:50:04 (7 years ago)
Author:
erobo
Message:

CHG: cosmetic changes and slimmed down number of files in headers

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

Legend:

Unmodified
Added
Removed

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

    r22438 r22441  
    88/*Headers:*/
    99#include "./Definition.h"
    10 #include "../datastructures/datastructures.h"
    11 #include "./Elements/Element.h"
    12 #include "./Elements/Elements.h"
    1310#include "./FemModel.h"
    14 #include "../modules/SurfaceAreax/SurfaceAreax.h"
    15 #include "../classes/Params/Parameters.h"
    16 #include "../classes/Inputs/Input.h"
    17 #include "../classes/gauss/Gauss.h"
    1811
    1912IssmDouble OutputDefinitionsResponsex(FemModel* femmodel,int output_enum);

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

    r22438 r22441  
    99/*{{{*/
    1010#include "./Definition.h"
    11 #include "../datastructures/datastructures.h"
    12 #include "./Elements/Element.h"
    13 #include "./Elements/Elements.h"
    1411#include "./FemModel.h"
    15 #include "../modules/SurfaceAreax/SurfaceAreax.h"
    16 #include "../classes/Params/Parameters.h"
    17 #include "../classes/Inputs/Input.h"
    18 #include "../classes/gauss/Gauss.h"
    1912/*}}}*/
    2013

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

    r22438 r22441  
    88/*Headers:*/
    99#include "./Definition.h"
    10 #include "../datastructures/datastructures.h"
    11 #include "./Elements/Element.h"
    12 #include "./Elements/Elements.h"
    1310#include "./FemModel.h"
    14 #include "./ExternalResults/ExternalResult.h"
    15 #include "./ExternalResults/Results.h"
    16 #include "../modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h"
    17 #include "../modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h"
    18 #include "../modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h"
    19 #include "../modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h"
    20 #include "../modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"
    21 #include "../modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h"
    22 #include "../modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h"
    23 #include "../modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
    24 #include "../modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h"
    2511
    2612
    … …  
    2915class Numberedcostfunction: public Object, public Definition{
    3016
    31         public:
     17public:
    3218
    33                 int   definitionenum;
    34                 char* name;
    35                 int   number_cost_functions;
    36                 int*  cost_functions_list;
    37                
    38                 /*Numberedcostfunction constructors, destructors :*/
    39                 Numberedcostfunction();
    40                 Numberedcostfunction(char* in_name, int in_definitionenum,int number_cost_functions_in,int* cost_functions_list_in);
    41                 ~Numberedcostfunction();
     19int   definitionenum;
     20char* name;
     21int   number_cost_functions;
     22int*  cost_functions_list;
    4223
    43                 /*Object virtual function resolutoin: */
    44                 Object* copy();
    45                 void            DeepEcho(void);
    46                 void            Echo(void);
    47                 int             Id(void);
    48                 void            Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
    49                 int             ObjectEnum(void);
     24/*Numberedcostfunction constructors, destructors :*/
     25Numberedcostfunction();
     26Numberedcostfunction(char* in_name, int in_definitionenum,int number_cost_functions_in,int* cost_functions_list_in);
     27~Numberedcostfunction();
    5028
    51                 /*Definition virtual function resolutoin: */
    52                 int             DefinitionEnum();
    53                 char*           Name();
    54                 IssmDouble Response(FemModel* femmodel);
     29/*Object virtual function resolutoin: */
     30Object* copy();
     31void            DeepEcho(void);
     32void            Echo(void);
     33int             Id(void);
     34void            Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
     35int             ObjectEnum(void);
     36
     37/*Definition virtual function resolutoin: */
     38int             DefinitionEnum();
     39char*           Name();
     40IssmDouble Response(FemModel* femmodel);
    5541};
    5642

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

    r22438 r22441  
    99/*{{{*/
    1010#include "./Definition.h"
    11 #include "../datastructures/datastructures.h"
    12 #include "./Elements/Element.h"
    13 #include "./Elements/Elements.h"
    1411#include "./FemModel.h"
    15 #include "../classes/Params/Parameters.h"
    1612
    1713/*}}}*/
Note: See TracChangeset for help on using the changeset viewer.