Changeset 15012


Ignore:
Timestamp:
05/11/13 14:23:52 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved classes/objects back to classes

Location:
issm/trunk-jpl/src/c
Files:
2 deleted
174 edited
30 copied

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/Makefile.am

    r15009 r15012  
    2222                           ./main/globals.h\
    2323                                        ./classes/classes.h\
    24                                         ./classes/objects.h\
    25                                         ./classes/objects/Object.h\
     24                                        ./classes/Object.h\
    2625                                        ./classes/gauss/GaussTria.h\
    2726                                        ./classes/gauss/GaussTria.cpp\
    28                                         ./classes/objects/Update.h\
    29                                         ./classes/objects/Element.h\
     27                                        ./classes/Update.h\
     28                                        ./classes/Element.h\
    3029                                        ./classes/FemModel.h\
    3130                                        ./classes/FemModel.cpp\
    32                                         ./classes/objects/Material.h\
    33                                         ./classes/objects/Load.h\
    34                                         ./classes/objects/Contour.h\
    35                                         ./classes/objects/Loads/Friction.h\
    36                                         ./classes/objects/Loads/Friction.cpp\
    37                                         ./classes/objects/Inputs/TransientInput.h\
    38                                         ./classes/objects/Inputs/TransientInput.cpp\
    39                                         ./classes/objects/Constraints/SpcTransient.cpp\
    40                                         ./classes/objects/Constraints/SpcTransient.h\
    41                                         ./classes/objects/IndependentObject.h\
    42                                         ./classes/objects/IndependentObject.cpp\
    43                                         ./classes/objects/DependentObject.h\
    44                                         ./classes/objects/DependentObject.cpp\
     31                                        ./classes/Material.h\
     32                                        ./classes/Load.h\
     33                                        ./classes/Contour.h\
     34                                        ./classes/Loads/Friction.h\
     35                                        ./classes/Loads/Friction.cpp\
     36                                        ./classes/Inputs/TransientInput.h\
     37                                        ./classes/Inputs/TransientInput.cpp\
     38                                        ./classes/Constraints/SpcTransient.cpp\
     39                                        ./classes/Constraints/SpcTransient.h\
     40                                        ./classes/IndependentObject.h\
     41                                        ./classes/IndependentObject.cpp\
     42                                        ./classes/DependentObject.h\
     43                                        ./classes/DependentObject.cpp\
    4544                                        ./classes/DofIndexing.h\
    4645                                        ./classes/DofIndexing.cpp\
    4746                                        ./classes/IoModel.h\
    4847                                        ./classes/IoModel.cpp\
    49                                         ./classes/objects/DataSet.h\
    50                                         ./classes/objects/DataSet.cpp\
    51                                         ./classes/objects/Nodes.h\
    52                                         ./classes/objects/Nodes.cpp\
    53                                         ./classes/objects/Vertices.h\
    54                                         ./classes/objects/Vertices.cpp\
    55                                         ./classes/objects/Bucket.h\
    56                                         ./classes/objects/Node.h\
    57                                         ./classes/objects/Node.cpp\
    58                                         ./classes/objects/Segment.h\
    59                                         ./classes/objects/Vertex.h\
    60                                         ./classes/objects/Vertex.cpp\
    61                                         ./classes/objects/AdolcEdf.h\
     48                                        ./classes/DataSet.h\
     49                                        ./classes/DataSet.cpp\
     50                                        ./classes/Nodes.h\
     51                                        ./classes/Nodes.cpp\
     52                                        ./classes/Vertices.h\
     53                                        ./classes/Vertices.cpp\
     54                                        ./classes/Bucket.h\
     55                                        ./classes/Node.h\
     56                                        ./classes/Node.cpp\
     57                                        ./classes/Segment.h\
     58                                        ./classes/Vertex.h\
     59                                        ./classes/Vertex.cpp\
     60                                        ./classes/AdolcEdf.h\
    6261                                        ./classes/ToolkitOptions.h\
    6362                                        ./classes/ToolkitOptions.cpp\
     
    6665                                        ./classes/Patch.h\
    6766                                        ./classes/Patch.cpp\
    68                                         ./classes/objects/ElementResults/ElementResultLocal.h\
    69                                         ./classes/objects/ElementResults/DoubleElementResult.h\
    70                                         ./classes/objects/ElementResults/DoubleElementResult.cpp\
    71                                         ./classes/objects/ElementResults/TriaP1ElementResult.h\
    72                                         ./classes/objects/ElementResults/TriaP1ElementResult.cpp\
    73                                         ./classes/objects/ElementResults/BoolElementResult.h\
    74                                         ./classes/objects/ElementResults/BoolElementResult.cpp\
    75                                         ./classes/objects/ExternalResults/Results.h\
    76                                         ./classes/objects/ExternalResults/Results.cpp\
    77                                         ./classes/objects/ExternalResults/ExternalResult.h\
    78                                         ./classes/objects/ExternalResults/GenericExternalResult.h\
    79                                         ./classes/objects/Elements/Elements.h\
    80                                         ./classes/objects/Elements/Elements.cpp\
    81                                         ./classes/objects/Elements/Tria.h\
    82                                         ./classes/objects/Elements/Tria.cpp\
    83                                         ./classes/objects/Elements/TriaHook.h\
    84                                         ./classes/objects/Elements/TriaHook.cpp\
    85                                         ./classes/objects/Elements/TriaRef.h\
    86                                         ./classes/objects/Elements/TriaRef.cpp\
    87                                         ./classes/objects/Inputs/Inputs.h\
    88                                         ./classes/objects/Inputs/Inputs.cpp\
    89                                         ./classes/objects/Inputs/Input.h\
    90                                         ./classes/objects/Inputs/InputLocal.h\
    91                                         ./classes/objects/Inputs/TriaP1Input.h\
    92                                         ./classes/objects/Inputs/TriaP1Input.cpp\
    93                                         ./classes/objects/Inputs/BoolInput.h\
    94                                         ./classes/objects/Inputs/BoolInput.cpp\
    95                                         ./classes/objects/Inputs/IntInput.h\
    96                                         ./classes/objects/Inputs/IntInput.cpp\
    97                                         ./classes/objects/Inputs/DoubleInput.h\
    98                                         ./classes/objects/Inputs/DoubleInput.cpp\
    99                                         ./classes/objects/Inputs/DatasetInput.h\
    100                                         ./classes/objects/Inputs/DatasetInput.cpp\
    101                                         ./classes/objects/Materials/Materials.h\
    102                                         ./classes/objects/Materials/Materials.cpp\
    103                                         ./classes/objects/Materials/Matice.h\
    104                                         ./classes/objects/Materials/Matice.cpp\
    105                                         ./classes/objects/Materials/Matdamageice.h\
    106                                         ./classes/objects/Materials/Matdamageice.cpp\
    107                                         ./classes/objects/Materials/Matpar.h\
    108                                         ./classes/objects/Materials/Matpar.cpp\
    109                                         ./classes/objects/Constraints/Constraints.h\
    110                                         ./classes/objects/Constraints/Constraints.cpp\
    111                                         ./classes/objects/Constraints/Constraint.h\
    112                                         ./classes/objects/Constraints/SpcStatic.cpp\
    113                                         ./classes/objects/Constraints/SpcStatic.h\
    114                                         ./classes/objects/Constraints/SpcDynamic.cpp\
    115                                         ./classes/objects/Constraints/SpcDynamic.h\
    116                                         ./classes/objects/Loads/Loads.h\
    117                                         ./classes/objects/Loads/Loads.cpp\
    118                                         ./classes/objects/Loads/Penpair.cpp\
    119                                         ./classes/objects/Loads/Penpair.h\
    120                                         ./classes/objects/Loads/Pengrid.cpp\
    121                                         ./classes/objects/Loads/Pengrid.h\
    122                                         ./classes/objects/Loads/Icefront.cpp\
    123                                         ./classes/objects/Loads/Icefront.h\
    124                                         ./classes/objects/Loads/Numericalflux.cpp\
    125                                         ./classes/objects/Loads/Numericalflux.h\
     67                                        ./classes/ElementResults/ElementResultLocal.h\
     68                                        ./classes/ElementResults/DoubleElementResult.h\
     69                                        ./classes/ElementResults/DoubleElementResult.cpp\
     70                                        ./classes/ElementResults/TriaP1ElementResult.h\
     71                                        ./classes/ElementResults/TriaP1ElementResult.cpp\
     72                                        ./classes/ElementResults/BoolElementResult.h\
     73                                        ./classes/ElementResults/BoolElementResult.cpp\
     74                                        ./classes/ExternalResults/Results.h\
     75                                        ./classes/ExternalResults/Results.cpp\
     76                                        ./classes/ExternalResults/ExternalResult.h\
     77                                        ./classes/ExternalResults/GenericExternalResult.h\
     78                                        ./classes/Elements/Elements.h\
     79                                        ./classes/Elements/Elements.cpp\
     80                                        ./classes/Elements/Tria.h\
     81                                        ./classes/Elements/Tria.cpp\
     82                                        ./classes/Elements/TriaHook.h\
     83                                        ./classes/Elements/TriaHook.cpp\
     84                                        ./classes/Elements/TriaRef.h\
     85                                        ./classes/Elements/TriaRef.cpp\
     86                                        ./classes/Inputs/Inputs.h\
     87                                        ./classes/Inputs/Inputs.cpp\
     88                                        ./classes/Inputs/Input.h\
     89                                        ./classes/Inputs/InputLocal.h\
     90                                        ./classes/Inputs/TriaP1Input.h\
     91                                        ./classes/Inputs/TriaP1Input.cpp\
     92                                        ./classes/Inputs/BoolInput.h\
     93                                        ./classes/Inputs/BoolInput.cpp\
     94                                        ./classes/Inputs/IntInput.h\
     95                                        ./classes/Inputs/IntInput.cpp\
     96                                        ./classes/Inputs/DoubleInput.h\
     97                                        ./classes/Inputs/DoubleInput.cpp\
     98                                        ./classes/Inputs/DatasetInput.h\
     99                                        ./classes/Inputs/DatasetInput.cpp\
     100                                        ./classes/Materials/Materials.h\
     101                                        ./classes/Materials/Materials.cpp\
     102                                        ./classes/Materials/Matice.h\
     103                                        ./classes/Materials/Matice.cpp\
     104                                        ./classes/Materials/Matdamageice.h\
     105                                        ./classes/Materials/Matdamageice.cpp\
     106                                        ./classes/Materials/Matpar.h\
     107                                        ./classes/Materials/Matpar.cpp\
     108                                        ./classes/Constraints/Constraints.h\
     109                                        ./classes/Constraints/Constraints.cpp\
     110                                        ./classes/Constraints/Constraint.h\
     111                                        ./classes/Constraints/SpcStatic.cpp\
     112                                        ./classes/Constraints/SpcStatic.h\
     113                                        ./classes/Constraints/SpcDynamic.cpp\
     114                                        ./classes/Constraints/SpcDynamic.h\
     115                                        ./classes/Loads/Loads.h\
     116                                        ./classes/Loads/Loads.cpp\
     117                                        ./classes/Loads/Penpair.cpp\
     118                                        ./classes/Loads/Penpair.h\
     119                                        ./classes/Loads/Pengrid.cpp\
     120                                        ./classes/Loads/Pengrid.h\
     121                                        ./classes/Loads/Icefront.cpp\
     122                                        ./classes/Loads/Icefront.h\
     123                                        ./classes/Loads/Numericalflux.cpp\
     124                                        ./classes/Loads/Numericalflux.h\
    126125                                        ./classes/matrix/matrixobjects.h\
    127126                                        ./classes/matrix/ElementMatrix.h\
     
    133132                                        ./classes/toolkits/Vector.h\
    134133                                        ./classes/toolkits/Solver.h\
    135                                         ./classes/objects/Params/Parameters.h\
    136                                         ./classes/objects/Params/Parameters.cpp\
    137                                         ./classes/objects/Params/Param.h\
    138                                         ./classes/objects/Params/GenericParam.h\
    139                                         ./classes/objects/Params/BoolParam.cpp\
    140                                         ./classes/objects/Params/BoolParam.h\
    141                                         ./classes/objects/Params/IntParam.cpp\
    142                                         ./classes/objects/Params/IntParam.h\
    143                                         ./classes/objects/Params/IntVecParam.cpp\
    144                                         ./classes/objects/Params/IntVecParam.h\
    145                                         ./classes/objects/Params/IntMatParam.cpp\
    146                                         ./classes/objects/Params/IntMatParam.h\
    147                                         ./classes/objects/Params/DoubleParam.cpp\
    148                                         ./classes/objects/Params/DoubleParam.h\
    149                                         ./classes/objects/Params/FileParam.cpp\
    150                                         ./classes/objects/Params/FileParam.h\
    151                                         ./classes/objects/Params/StringArrayParam.cpp\
    152                                         ./classes/objects/Params/StringArrayParam.h\
    153                                         ./classes/objects/Params/DoubleMatParam.cpp\
    154                                         ./classes/objects/Params/DoubleMatParam.h\
    155                                         ./classes/objects/Params/DoubleTransientMatParam.cpp\
    156                                         ./classes/objects/Params/DoubleTransientMatParam.h\
    157                                         ./classes/objects/Params/DoubleMatArrayParam.cpp\
    158                                         ./classes/objects/Params/DoubleMatArrayParam.h\
    159                                         ./classes/objects/Params/DoubleVecParam.cpp\
    160                                         ./classes/objects/Params/DoubleVecParam.h\
    161                                         ./classes/objects/Params/StringParam.cpp\
    162                                         ./classes/objects/Params/StringParam.h\
    163                                         ./classes/objects/Params/MatrixParam.h\
    164                                         ./classes/objects/Params/MatrixParam.cpp\
    165                                         ./classes/objects/Params/VectorParam.h\
    166                                         ./classes/objects/Params/VectorParam.cpp\
    167                                         ./classes/objects/Params/TransientParam.h\
    168                                         ./classes/objects/Params/TransientParam.cpp\
    169                                         ./classes/objects/Params/DataSetParam.h\
    170                                         ./classes/objects/Params/DataSetParam.cpp\
    171                                         ./classes/objects/Profiler.h\
    172                                         ./classes/objects/Profiler.cpp\
     134                                        ./classes/Params/Parameters.h\
     135                                        ./classes/Params/Parameters.cpp\
     136                                        ./classes/Params/Param.h\
     137                                        ./classes/Params/GenericParam.h\
     138                                        ./classes/Params/BoolParam.cpp\
     139                                        ./classes/Params/BoolParam.h\
     140                                        ./classes/Params/IntParam.cpp\
     141                                        ./classes/Params/IntParam.h\
     142                                        ./classes/Params/IntVecParam.cpp\
     143                                        ./classes/Params/IntVecParam.h\
     144                                        ./classes/Params/IntMatParam.cpp\
     145                                        ./classes/Params/IntMatParam.h\
     146                                        ./classes/Params/DoubleParam.cpp\
     147                                        ./classes/Params/DoubleParam.h\
     148                                        ./classes/Params/FileParam.cpp\
     149                                        ./classes/Params/FileParam.h\
     150                                        ./classes/Params/StringArrayParam.cpp\
     151                                        ./classes/Params/StringArrayParam.h\
     152                                        ./classes/Params/DoubleMatParam.cpp\
     153                                        ./classes/Params/DoubleMatParam.h\
     154                                        ./classes/Params/DoubleTransientMatParam.cpp\
     155                                        ./classes/Params/DoubleTransientMatParam.h\
     156                                        ./classes/Params/DoubleMatArrayParam.cpp\
     157                                        ./classes/Params/DoubleMatArrayParam.h\
     158                                        ./classes/Params/DoubleVecParam.cpp\
     159                                        ./classes/Params/DoubleVecParam.h\
     160                                        ./classes/Params/StringParam.cpp\
     161                                        ./classes/Params/StringParam.h\
     162                                        ./classes/Params/MatrixParam.h\
     163                                        ./classes/Params/MatrixParam.cpp\
     164                                        ./classes/Params/VectorParam.h\
     165                                        ./classes/Params/VectorParam.cpp\
     166                                        ./classes/Params/TransientParam.h\
     167                                        ./classes/Params/TransientParam.cpp\
     168                                        ./classes/Params/DataSetParam.h\
     169                                        ./classes/Params/DataSetParam.cpp\
     170                                        ./classes/Profiler.h\
     171                                        ./classes/Profiler.cpp\
    173172                                        ./shared/shared.h\
    174173                                        ./shared/MemOps/MemOps.h\
     
    331330                                        ./solutionsequences/solutionsequence_nonlinear.cpp\
    332331                                        ./solutionsequences/solutionsequence_newton.cpp\
    333                                         ./classes/objects/Options/Options.h\
    334                                         ./classes/objects/Options/Options.cpp\
    335                                         ./classes/objects/Options/Option.h\
    336                                         ./classes/objects/Options/GenericOption.h\
    337                                         ./classes/objects/Options/OptionUtilities.cpp\
    338                                         ./classes/objects/Options/OptionUtilities.h\
     332                                        ./classes/Options/Options.h\
     333                                        ./classes/Options/Options.cpp\
     334                                        ./classes/Options/Option.h\
     335                                        ./classes/Options/GenericOption.h\
     336                                        ./classes/Options/OptionUtilities.cpp\
     337                                        ./classes/Options/OptionUtilities.h\
    339338                                        ./classes/RiftStruct.cpp\
    340339                                        ./classes/RiftStruct.h
     
    428427                                          ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
    429428                                          ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
    430                                           ./classes/objects/Inputs/ControlInput.h\
    431                                           ./classes/objects/Inputs/ControlInput.cpp\
     429                                          ./classes/Inputs/ControlInput.h\
     430                                          ./classes/Inputs/ControlInput.cpp\
    432431                                          ./shared/Numerics/BrentSearch.cpp\
    433432                                          ./shared/Numerics/OptimalSearch.cpp \
     
    522521#}}}
    523522#Rifts sources  {{{
    524 rifts_sources = ./classes/objects/Loads/Riftfront.cpp\
    525                                     ./classes/objects/Loads/Riftfront.h\
     523rifts_sources = ./classes/Loads/Riftfront.cpp\
     524                                    ./classes/Loads/Riftfront.h\
    526525                                    ./modules/ConstraintsStatex/RiftConstraintsState.cpp
    527526#}}}
     
    532531threed_sources = ./classes/gauss/GaussPenta.h\
    533532                                     ./classes/gauss/GaussPenta.cpp\
    534                                      ./classes/objects/ElementResults/PentaP1ElementResult.h\
    535                                      ./classes/objects/ElementResults/PentaP1ElementResult.cpp\
    536                                      ./classes/objects/Inputs/PentaP1Input.h\
    537                                      ./classes/objects/Inputs/PentaP1Input.cpp\
    538                                      ./classes/objects/Elements/Penta.h\
    539                                      ./classes/objects/Elements/Penta.cpp\
    540                                      ./classes/objects/Elements/PentaHook.h\
    541                                      ./classes/objects/Elements/PentaHook.cpp\
    542                                      ./classes/objects/Elements/PentaRef.h\
    543                                      ./classes/objects/Elements/PentaRef.cpp
     533                                     ./classes/ElementResults/PentaP1ElementResult.h\
     534                                     ./classes/ElementResults/PentaP1ElementResult.cpp\
     535                                     ./classes/Inputs/PentaP1Input.h\
     536                                     ./classes/Inputs/PentaP1Input.cpp\
     537                                     ./classes/Elements/Penta.h\
     538                                     ./classes/Elements/Penta.cpp\
     539                                     ./classes/Elements/PentaHook.h\
     540                                     ./classes/Elements/PentaHook.cpp\
     541                                     ./classes/Elements/PentaRef.h\
     542                                     ./classes/Elements/PentaRef.cpp
    544543#}}}
    545544#Bamg sources  {{{
     
    664663                             ./modules/KMLOverlayx/KMLOverlayx.h\
    665664                             ./modules/KMLOverlayx/KMLOverlayx.cpp\
    666                              ./classes/objects/KML/KML_Attribute.cpp\
    667                              ./classes/objects/KML/KML_Attribute.h\
    668                              ./classes/objects/KML/KML_Comment.cpp\
    669                              ./classes/objects/KML/KML_Comment.h\
    670                              ./classes/objects/KML/KML_ColorStyle.cpp\
    671                              ./classes/objects/KML/KML_ColorStyle.h\
    672                              ./classes/objects/KML/KML_Container.cpp\
    673                              ./classes/objects/KML/KML_Container.h\
    674                              ./classes/objects/KML/KML_Document.cpp\
    675                              ./classes/objects/KML/KML_Document.h\
    676                              ./classes/objects/KML/KML_Feature.cpp\
    677                              ./classes/objects/KML/KML_Feature.h\
    678                              ./classes/objects/KML/KML_File.cpp\
    679                              ./classes/objects/KML/KML_File.h\
    680                              ./classes/objects/KML/KML_Folder.cpp\
    681                              ./classes/objects/KML/KML_Folder.h\
    682                              ./classes/objects/KML/KML_Geometry.cpp\
    683                              ./classes/objects/KML/KML_Geometry.h\
    684                              ./classes/objects/KML/KML_GroundOverlay.cpp\
    685                              ./classes/objects/KML/KML_GroundOverlay.h\
    686                              ./classes/objects/KML/KML_Icon.cpp\
    687                              ./classes/objects/KML/KML_Icon.h\
    688                              ./classes/objects/KML/KML_LatLonBox.cpp\
    689                              ./classes/objects/KML/KML_LatLonBox.h\
    690                              ./classes/objects/KML/KML_LinearRing.cpp\
    691                              ./classes/objects/KML/KML_LinearRing.h\
    692                              ./classes/objects/KML/KML_LineString.cpp\
    693                              ./classes/objects/KML/KML_LineString.h\
    694                              ./classes/objects/KML/KML_LineStyle.cpp\
    695                              ./classes/objects/KML/KML_LineStyle.h\
    696                              ./classes/objects/KML/KML_MultiGeometry.cpp\
    697                              ./classes/objects/KML/KML_MultiGeometry.h\
    698                              ./classes/objects/KML/KML_Object.cpp\
    699                              ./classes/objects/KML/KML_Object.h\
    700                              ./classes/objects/KML/KML_Overlay.cpp\
    701                              ./classes/objects/KML/KML_Overlay.h\
    702                              ./classes/objects/KML/KML_Point.cpp\
    703                              ./classes/objects/KML/KML_Point.h\
    704                              ./classes/objects/KML/KML_Placemark.cpp\
    705                              ./classes/objects/KML/KML_Placemark.h\
    706                              ./classes/objects/KML/KML_Polygon.cpp\
    707                              ./classes/objects/KML/KML_Polygon.h\
    708                              ./classes/objects/KML/KML_PolyStyle.cpp\
    709                              ./classes/objects/KML/KML_PolyStyle.h\
    710                              ./classes/objects/KML/KML_Style.cpp\
    711                              ./classes/objects/KML/KML_Style.h\
    712                              ./classes/objects/KML/KML_StyleSelector.cpp\
    713                              ./classes/objects/KML/KML_StyleSelector.h\
    714                              ./classes/objects/KML/KML_SubStyle.cpp\
    715                              ./classes/objects/KML/KML_SubStyle.h\
    716                              ./classes/objects/KML/KML_Unknown.cpp\
    717                              ./classes/objects/KML/KML_Unknown.h\
    718                              ./classes/objects/KML/KMLFileReadUtils.cpp\
    719                              ./classes/objects/KML/KMLFileReadUtils.h
     665                             ./classes/KML/KML_Attribute.cpp\
     666                             ./classes/KML/KML_Attribute.h\
     667                             ./classes/KML/KML_Comment.cpp\
     668                             ./classes/KML/KML_Comment.h\
     669                             ./classes/KML/KML_ColorStyle.cpp\
     670                             ./classes/KML/KML_ColorStyle.h\
     671                             ./classes/KML/KML_Container.cpp\
     672                             ./classes/KML/KML_Container.h\
     673                             ./classes/KML/KML_Document.cpp\
     674                             ./classes/KML/KML_Document.h\
     675                             ./classes/KML/KML_Feature.cpp\
     676                             ./classes/KML/KML_Feature.h\
     677                             ./classes/KML/KML_File.cpp\
     678                             ./classes/KML/KML_File.h\
     679                             ./classes/KML/KML_Folder.cpp\
     680                             ./classes/KML/KML_Folder.h\
     681                             ./classes/KML/KML_Geometry.cpp\
     682                             ./classes/KML/KML_Geometry.h\
     683                             ./classes/KML/KML_GroundOverlay.cpp\
     684                             ./classes/KML/KML_GroundOverlay.h\
     685                             ./classes/KML/KML_Icon.cpp\
     686                             ./classes/KML/KML_Icon.h\
     687                             ./classes/KML/KML_LatLonBox.cpp\
     688                             ./classes/KML/KML_LatLonBox.h\
     689                             ./classes/KML/KML_LinearRing.cpp\
     690                             ./classes/KML/KML_LinearRing.h\
     691                             ./classes/KML/KML_LineString.cpp\
     692                             ./classes/KML/KML_LineString.h\
     693                             ./classes/KML/KML_LineStyle.cpp\
     694                             ./classes/KML/KML_LineStyle.h\
     695                             ./classes/KML/KML_MultiGeometry.cpp\
     696                             ./classes/KML/KML_MultiGeometry.h\
     697                             ./classes/KML/KML_Object.cpp\
     698                             ./classes/KML/KML_Object.h\
     699                             ./classes/KML/KML_Overlay.cpp\
     700                             ./classes/KML/KML_Overlay.h\
     701                             ./classes/KML/KML_Point.cpp\
     702                             ./classes/KML/KML_Point.h\
     703                             ./classes/KML/KML_Placemark.cpp\
     704                             ./classes/KML/KML_Placemark.h\
     705                             ./classes/KML/KML_Polygon.cpp\
     706                             ./classes/KML/KML_Polygon.h\
     707                             ./classes/KML/KML_PolyStyle.cpp\
     708                             ./classes/KML/KML_PolyStyle.h\
     709                             ./classes/KML/KML_Style.cpp\
     710                             ./classes/KML/KML_Style.h\
     711                             ./classes/KML/KML_StyleSelector.cpp\
     712                             ./classes/KML/KML_StyleSelector.h\
     713                             ./classes/KML/KML_SubStyle.cpp\
     714                             ./classes/KML/KML_SubStyle.h\
     715                             ./classes/KML/KML_Unknown.cpp\
     716                             ./classes/KML/KML_Unknown.h\
     717                             ./classes/KML/KMLFileReadUtils.cpp\
     718                             ./classes/KML/KMLFileReadUtils.h
    720719#}}}
    721720#Petsc sources  {{{
  • issm/trunk-jpl/src/c/classes/Bucket.h

    r15011 r15012  
    88/*Headers:*/
    99/*{{{*/
     10#include "./DataSet.h"
    1011#include "./Object.h"
    11 #include "../../shared/MemOps/MemOps.h"
    12 #include "../../classes/objects/DataSet.h"
    13 #include "../../toolkits/toolkitsenums.h"
     12#include "../shared/MemOps/MemOps.h"
     13#include "../toolkits/toolkitsenums.h"
    1414/*}}}*/
    1515
  • issm/trunk-jpl/src/c/classes/Constraints/Constraint.h

    r13623 r15012  
    1212class Nodes;
    1313#include "../Object.h"
    14 #include "../../../toolkits/toolkits.h"
     14#include "../../toolkits/toolkits.h"
    1515/*}}}*/
    1616
  • issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp

    r14996 r15012  
    1212
    1313#include "./Constraints.h"
    14 #include "../../../shared/shared.h"
    15 #include "../../../toolkits/toolkits.h"
     14#include "../../shared/shared.h"
     15#include "../../toolkits/toolkits.h"
    1616
    1717using namespace std;
    1818/*}}}*/
    19 
    2019
    2120/*Numerics: */
  • issm/trunk-jpl/src/c/classes/Constraints/Constraints.h

    r14996 r15012  
    44/*forward declarations */
    55#include "../DataSet.h"
    6 #include "../../../shared/shared.h"
     6#include "../../shared/shared.h"
    77
    88/*! \brief Declaration of Constraints class.
  • issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../../shared/shared.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../objects.h"
     11#include "../classes.h"
     12#include "./Constraint.h"
     13#include "../../shared/shared.h"
    1614
    1715/*SpcDynamic constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../../shared/shared.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../objects.h"
     11#include "../classes.h"
     12#include "./Constraint.h"
     13#include "../../shared/shared.h"
    1614
    1715/*SpcStatic constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../../shared/shared.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../objects.h"
     11#include "../classes.h"
     12#include "./Constraint.h"
     13#include "shared/shared.h"
    1614
    1715/*SpcTransient constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Contour.h

    r15011 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../shared/Exceptions/exceptions.h"
    11 #include "../../shared/MemOps/MemOps.h"
    12 #include "../../shared/io/io.h"
    13 #include "../../shared/Enum/Enum.h"
     10#include "../shared/Exceptions/exceptions.h"
     11#include "../shared/MemOps/MemOps.h"
     12#include "../shared/io/io.h"
     13#include "../shared/Enum/Enum.h"
    1414#include "./Object.h"
    1515/*}}}*/
  • issm/trunk-jpl/src/c/classes/DataSet.cpp

    r15011 r15012  
    1818
    1919#include "./DataSet.h"
    20 #include "../../shared/shared.h"
     20#include "../shared/shared.h"
    2121
    2222using namespace std;
  • issm/trunk-jpl/src/c/classes/DataSet.h

    r15011 r15012  
    55#include <cstring>
    66#include "./Contour.h"
    7 #include "../../shared/Exp/exp.h"
     7#include "../shared/Exp/exp.h"
    88
    99/*forward declarations */
  • issm/trunk-jpl/src/c/classes/DependentObject.cpp

    r15011 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "./objects.h"
    14 #include "../../shared/Enum/Enum.h"
    15 #include "../../shared/shared.h"
     11#include "./classes.h"
     12#include "shared/shared.h"
    1613
    1714/*DependentObject constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/DependentObject.h

    r15011 r15012  
    88/*{{{*/
    99#include "./Object.h"
    10 #include "../../shared/shared.h"
     10#include "../shared/shared.h"
    1111/*}}}*/
    1212
  • issm/trunk-jpl/src/c/classes/ElementResults/BoolElementResult.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "./ElementResultLocal.h"
    14 #include "../../classes.h"
    15 #include "../../../shared/Enum/Enum.h"
    16 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1713
    1814/*BoolElementResult constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/ElementResults/BoolElementResult.h

    r14917 r15012  
    88
    99/*Headers:*/
    10 /*{{{*/
    1110#include "../Inputs/Input.h"
    1211class Parameters;
    13 /*}}}*/
    1412
    1513class BoolElementResult: public ElementResult{
  • issm/trunk-jpl/src/c/classes/ElementResults/DoubleElementResult.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "./ElementResultLocal.h"
    14 #include "../../classes.h"
    15 #include "../../../shared/Enum/Enum.h"
    16 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1713
    1814/*DoubleElementResult constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/ElementResults/DoubleElementResult.h

    r14917 r15012  
    88
    99/*Headers:*/
    10 /*{{{*/
    1110#include "../Inputs/Input.h"
    1211class Parameters;
    13 /*}}}*/
    1412
    1513class DoubleElementResult: public ElementResult{
  • issm/trunk-jpl/src/c/classes/ElementResults/ElementResult.h

    r14975 r15012  
    77
    88/*Headers:*/
    9 /*{{{*/
    109#include "../Object.h"
    1110class Patch;
    12 /*}}}*/
     11class Parameters;
    1312
    1413class ElementResult:public Object{
  • issm/trunk-jpl/src/c/classes/ElementResults/PentaP1ElementResult.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "./ElementResultLocal.h"
    14 #include "../../classes.h"
    15 #include "../../../shared/Enum/Enum.h"
    16 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1713
    1814/*PentaP1ElementResult constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/ElementResults/PentaP1ElementResult.h

    r14917 r15012  
    88
    99/*Headers:*/
    10 /*{{{*/
    1110#include "../Inputs/Input.h"
    12 /*}}}*/
    1311
    1412class PentaP1ElementResult: public ElementResult{
  • issm/trunk-jpl/src/c/classes/ElementResults/TriaP1ElementResult.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "./ElementResultLocal.h"
    14 #include "../../classes.h"
    15 #include "../../../shared/Enum/Enum.h"
    16 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1713
    1814/*TriaP1ElementResult constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/ElementResults/TriaP1ElementResult.h

    r14917 r15012  
    77
    88/*Headers:*/
    9 /*{{{*/
    109#include "../Inputs/Input.h"
    11 /*}}}*/
    1210
    1311class TriaP1ElementResult: public ElementResult{
  • issm/trunk-jpl/src/c/classes/Elements/Element.h

    r14996 r15012  
    1111/*{{{*/
    1212#include "../Object.h"
    13 #include "../../Update.h"
     13#include "../Update.h"
    1414
    1515class DataSet;
     
    2525template <class doubletype> class Vector;
    2626
    27 #include "../../../toolkits/toolkits.h"
     27#include "../../toolkits/toolkits.h"
    2828/*}}}*/
    2929
  • issm/trunk-jpl/src/c/classes/Elements/Elements.cpp

    r14996 r15012  
    1616#include "../ExternalResults/Results.h"
    1717#include "../ExternalResults/GenericExternalResult.h"
    18 #include "../../toolkits/toolkitobjects.h"
    19 #include "../../Patch.h"
    20 #include "../../../shared/shared.h"
     18#include "../Patch.h"
     19#include "../toolkits/toolkitobjects.h"
     20#include "../../shared/shared.h"
    2121
    2222using namespace std;
  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Elements/Penta.h

    r14977 r15012  
    2323class ElementVector;
    2424
    25 #include "../../../shared/Exceptions/exceptions.h"
    26 #include "../../../shared/Enum/Enum.h"
     25#include "../../shared/Exceptions/exceptions.h"
     26#include "../../shared/Enum/Enum.h"
    2727/*}}}*/
    2828
  • issm/trunk-jpl/src/c/classes/Elements/PentaHook.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r15006 r15012  
    1313#include <stdio.h>
    1414#include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/shared.h"
     15#include "../classes.h"
     16#include "../../shared/shared.h"
    1717#ifdef _HAVE_GIA_
    18 #include "../../../modules/GiaDeflectionCorex/GiaDeflectionCorex.h"
     18#include "../../modules/GiaDeflectionCorex/GiaDeflectionCorex.h"
    1919#endif
    2020/*}}}*/
  • issm/trunk-jpl/src/c/classes/Elements/Tria.h

    r14996 r15012  
    2121class Vertex;
    2222
    23 #include "../../../shared/Exceptions/exceptions.h"
    24 #include "../../../shared/Enum/Enum.h"
     23#include "../../shared/Exceptions/exceptions.h"
     24#include "../../shared/Enum/Enum.h"
    2525/*}}}*/
    2626
  • issm/trunk-jpl/src/c/classes/Elements/TriaHook.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

    r14960 r15012  
    1414
    1515#include <cstring>
    16 
    17 #include "../../../shared/Exceptions/exceptions.h"
    18 #include "../../../shared/Numerics/recast.h"
    19 #include "../../../shared/Enum/Enum.h"
    20 #include "../../../shared/io/Comm/Comm.h"
    2116#include "./ExternalResult.h"
     17#include "../../shared/shared.h"
    2218/*}}}*/
    2319
  • issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include "../Params/Parameters.h"
    14 #include "../../../shared/shared.h"
    1513#include "./Results.h"
    1614#include "./ExternalResult.h"
     15#include "../../shared/shared.h"
     16#include "../Params/Parameters.h"
    1717#include "../ElementResults/ElementResult.h"
    1818
  • issm/trunk-jpl/src/c/classes/FemModel.h

    r14967 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "./objects/Object.h"
     10#include "./Object.h"
    1111#include "../toolkits/toolkits.h"
    1212class DataSet;
  • issm/trunk-jpl/src/c/classes/Hook.h

    r13413 r15012  
    1111/*Headers:*/
    1212/*{{{*/
    13 #include "./objects/Object.h"
     13#include "./Object.h"
    1414class DataSet;
    1515/*}}}*/
  • issm/trunk-jpl/src/c/classes/IndependentObject.cpp

    r15011 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "./objects.h"
    14 #include "../../shared/Enum/Enum.h"
    15 #include "../../shared/shared.h"
    16 #include "../IoModel.h"
     11#include "./classes.h"
     12#include "../shared/shared.h"
     13#include "IoModel.h"
    1714
    1815/*IndependentObject constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/IndependentObject.h

    r15011 r15012  
    88/*{{{*/
    99#include "./Object.h"
    10 #include "../../shared/shared.h"
     10#include "../shared/shared.h"
    1111/*}}}*/
    1212class IoModel;
  • issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*BoolInput constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*ControlInput constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613/*}}}*/
    1714
  • issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*DoubleInput constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Inputs/Input.h

    r14996 r15012  
    1515class GaussPenta;
    1616template <class doubletype> class Vector;
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp

    r14996 r15012  
    1313#include "./Input.h"
    1414#include "./Inputs.h"
    15 #include "../../../shared/shared.h"
     15#include "../../shared/shared.h"
    1616
    1717using namespace std;
  • issm/trunk-jpl/src/c/classes/Inputs/Inputs.h

    r14996 r15012  
    11#ifndef _CONTAINER_INPUTS_H_
    2 #define  _CONTAINER_INPUTS_H_
     2#define _CONTAINER_INPUTS_H_
    33
    44/*forward declarations */
     
    77
    88#include "../DataSet.h"
    9 #include "../../../shared/shared.h"
     9#include "../../shared/shared.h"
    1010
    1111/*! \brief Declaration of Inputs class.
  • issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*IntInput constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Inputs/PentaP1Input.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*PentaP1Input constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613/*}}}*/
    1714
  • issm/trunk-jpl/src/c/classes/Inputs/TriaP1Input.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*TriaP1Input constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/KML/KMLFileReadUtils.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KMLFileReadUtils.h

    r14960 r15012  
    77
    88/*Headers:{{{*/
    9 #include "../../../shared/Exceptions/exceptions.h"
    10 #include "../../../shared/Enum/Enum.h"
    11 
     9#include "../../shared/Exceptions/exceptions.h"
     10#include "../../shared/Enum/Enum.h"
    1211#include "../Object.h"
    1312/*}}}*/
    1413
    1514/* local prototypes: */
    16 char* KMLFileToken(FILE* fid,
    17                                    int* pncom,char*** ppcom);
     15char* KMLFileToken(FILE* fid, int* pncom,char*** ppcom);
    1816char* KMLFileTokenComment(FILE* fid);
    19 void KMLFileTokenBuffer(char** pbuffer,int* pibuf,int* pbuflen,
    20                                                 int c,
    21                                                 int bufblk);
    22 char* KMLFileTagName(char* pname,
    23                                          char* ktag);
    24 char* KMLFileTagName(char* pname,int *m,int maxlen,
    25                                          char* ktag);
    26 int KMLFileTagAttrib(KML_Object* kobj,
    27                                          char* ktag);
    28 int KMLFileTokenParse(int* pival,
    29                                           char* ktag,
    30                                           FILE* fid);
    31 int KMLFileTokenParse(bool* pbval,
    32                                           char* ktag,
    33                                           FILE* fid);
    34 char* KMLFileTokenParse(char* pstr,
    35                                                 char* ktag,
    36                                                 FILE* fid);
    37 char* KMLFileTokenParse(char* pstr,int *m,int maxlen,
    38                                                 char* ktag,
    39                                                 FILE* fid);
    40 int KMLFileTokenParse(float* pfval,
    41                                           char* ktag,
    42                                           FILE* fid);
    43 int KMLFileTokenParse(double* pdval,
    44                                           char* ktag,
    45                                           FILE* fid);
    46 int KMLFileTokenParse(double **pdval,int* m,int maxlen,
    47                                           char* ktag,
    48                                           FILE* fid);
    49 int KMLFileTokenParse(double **pdval,int* m,int n,int maxlen,
    50                                           char* ktag,
    51                                           FILE* fid);
    52 int KMLFileTagSkip(char* ktag,
    53                                    FILE* fid);
     17void KMLFileTokenBuffer(char** pbuffer,int* pibuf,int* pbuflen, int c, int bufblk);
     18char* KMLFileTagName(char* pname, char* ktag);
     19char* KMLFileTagName(char* pname,int *m,int maxlen, char* ktag);
     20int KMLFileTagAttrib(KML_Object* kobj, char* ktag);
     21int KMLFileTokenParse(int* pival, char* ktag, FILE* fid);
     22int KMLFileTokenParse(bool* pbval, char* ktag, FILE* fid);
     23char* KMLFileTokenParse(char* pstr, char* ktag, FILE* fid);
     24char* KMLFileTokenParse(char* pstr,int *m,int maxlen, char* ktag, FILE* fid);
     25int KMLFileTokenParse(float* pfval, char* ktag, FILE* fid);
     26int KMLFileTokenParse(double* pdval, char* ktag, FILE* fid);
     27int KMLFileTokenParse(double **pdval,int* m,int maxlen, char* ktag, FILE* fid);
     28int KMLFileTokenParse(double **pdval,int* m,int n,int maxlen, char* ktag, FILE* fid);
     29int KMLFileTagSkip(char* ktag, FILE* fid);
    5430
    5531#endif  /* _KMLFILEREADUTILS_H */
  • issm/trunk-jpl/src/c/classes/KML/KML_Attribute.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Attribute.h

    r14960 r15012  
    77
    88/*Headers:{{{*/
    9 #include "../../../shared/Exceptions/exceptions.h"
    10 #include "../../../shared/Enum/Enum.h"
    11 
     9#include "../../shared/Exceptions/exceptions.h"
     10#include "../../shared/Enum/Enum.h"
    1211#include "../Object.h"
    1312class DataSet;
  • issm/trunk-jpl/src/c/classes/KML/KML_ColorStyle.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_ColorStyle.h

    r14960 r15012  
    1111/*Headers:*/
    1212/*{{{*/
    13 #include "../../../shared/Exceptions/exceptions.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 
     13#include "../../shared/Exceptions/exceptions.h"
     14#include "../../shared/Enum/Enum.h"
    1615#include "./KML_SubStyle.h"
    1716/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_Comment.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Comment.h

    r14960 r15012  
    77
    88/*Headers:{{{*/
    9 #include "../../../shared/Exceptions/exceptions.h"
    10 #include "../../../shared/Enum/Enum.h"
    11 
     9#include "../../shared/Exceptions/exceptions.h"
     10#include "../../shared/Enum/Enum.h"
    1211#include "../Object.h"
    1312class DataSet;
  • issm/trunk-jpl/src/c/classes/KML/KML_Container.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Container.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Feature.h"
    1413class DataSet;
  • issm/trunk-jpl/src/c/classes/KML/KML_Document.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Document.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Container.h"
    1413class KML_Feature;
  • issm/trunk-jpl/src/c/classes/KML/KML_Feature.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Feature.h

    r14960 r15012  
    1313/*Headers:*/
    1414/*{{{*/
    15 #include "../../../shared/Exceptions/exceptions.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 
     15#include "../../shared/Exceptions/exceptions.h"
     16#include "../../shared/Enum/Enum.h"
    1817#include "./KML_Object.h"
    1918class KML_Style;
  • issm/trunk-jpl/src/c/classes/KML/KML_File.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_File.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1212
    1313#include "./KML_Feature.h"
  • issm/trunk-jpl/src/c/classes/KML/KML_Folder.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Folder.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Container.h"
    1413class KML_Feature;
  • issm/trunk-jpl/src/c/classes/KML/KML_Geometry.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Geometry.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Object.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_GroundOverlay.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_GroundOverlay.h

    r14960 r15012  
    1010/*Headers:*/
    1111/*{{{*/
    12 #include "../../../shared/Exceptions/exceptions.h"
    13 #include "../../../shared/Enum/Enum.h"
     12#include "../../shared/Exceptions/exceptions.h"
     13#include "../../shared/Enum/Enum.h"
    1414
    1515#include "./KML_Overlay.h"
  • issm/trunk-jpl/src/c/classes/KML/KML_Icon.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Icon.h

    r14960 r15012  
    1414/*Headers:*/
    1515/*{{{*/
    16 #include "../../../shared/Exceptions/exceptions.h"
    17 #include "../../../shared/Enum/Enum.h"
    18 
     16#include "../../shared/Exceptions/exceptions.h"
     17#include "../../shared/Enum/Enum.h"
    1918#include "./KML_Object.h"
    2019/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_LatLonBox.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_LatLonBox.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Object.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_LineString.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
    18 #include "../../../modules/Ll2xyx/Ll2xyx.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
     15#include "modules/Ll2xyx/Ll2xyx.h"
    1916/*}}}*/
    2017
  • issm/trunk-jpl/src/c/classes/KML/KML_LineString.h

    r14960 r15012  
    1010/*Headers:*/
    1111/*{{{*/
    12 #include "../../../shared/Exceptions/exceptions.h"
    13 #include "../../../shared/Enum/Enum.h"
    14 
     12#include "../../shared/Exceptions/exceptions.h"
     13#include "../../shared/Enum/Enum.h"
    1514#include "./KML_Geometry.h"
    1615/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_LineStyle.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_LineStyle.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_ColorStyle.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_LinearRing.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
    18 #include "../../../modules/Ll2xyx/Ll2xyx.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
     15#include "modules/Ll2xyx/Ll2xyx.h"
    1916/*}}}*/
    2017
  • issm/trunk-jpl/src/c/classes/KML/KML_LinearRing.h

    r14960 r15012  
    1010/*Headers:*/
    1111/*{{{*/
    12 #include "../../../shared/Exceptions/exceptions.h"
    13 #include "../../../shared/Enum/Enum.h"
    14 
     12#include "../../shared/Exceptions/exceptions.h"
     13#include "../../shared/Enum/Enum.h"
    1514#include "./KML_Geometry.h"
    1615/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_MultiGeometry.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_MultiGeometry.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Geometry.h"
    1413class KML_Geometry;
  • issm/trunk-jpl/src/c/classes/KML/KML_Object.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Object.h

    r14960 r15012  
    77
    88/*Headers:{{{*/
    9 #include "../../../shared/Exceptions/exceptions.h"
    10 #include "../../../shared/Enum/Enum.h"
    11 
     9#include "../../shared/Exceptions/exceptions.h"
     10#include "../../shared/Enum/Enum.h"
    1211#include "../Object.h"
    1312class DataSet;
  • issm/trunk-jpl/src/c/classes/KML/KML_Overlay.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Overlay.h

    r14960 r15012  
    1010/*Headers:*/
    1111/*{{{*/
    12 #include "../../../shared/Exceptions/exceptions.h"
    13 #include "../../../shared/Enum/Enum.h"
    14 
     12#include "../../shared/Exceptions/exceptions.h"
     13#include "../../shared/Enum/Enum.h"
    1514#include "./KML_Feature.h"
    1615class KML_Icon;
  • issm/trunk-jpl/src/c/classes/KML/KML_Placemark.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Placemark.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Feature.h"
    1413class KML_Geometry;
  • issm/trunk-jpl/src/c/classes/KML/KML_Point.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
    18 #include "../../../modules/Ll2xyx/Ll2xyx.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
     15#include "modules/Ll2xyx/Ll2xyx.h"
    1916/*}}}*/
    2017
  • issm/trunk-jpl/src/c/classes/KML/KML_Point.h

    r14960 r15012  
    1010/*Headers:*/
    1111/*{{{*/
    12 #include "../../../shared/Exceptions/exceptions.h"
    13 #include "../../../shared/Enum/Enum.h"
    14 
     12#include "../../shared/Exceptions/exceptions.h"
     13#include "../../shared/Enum/Enum.h"
    1514#include "./KML_Geometry.h"
    1615/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_PolyStyle.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_PolyStyle.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_ColorStyle.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_Polygon.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Polygon.h

    r14960 r15012  
    1010/*Headers:*/
    1111/*{{{*/
    12 #include "../../../shared/Exceptions/exceptions.h"
    13 #include "../../../shared/Enum/Enum.h"
    14 
     12#include "../../shared/Exceptions/exceptions.h"
     13#include "../../shared/Enum/Enum.h"
    1514#include "./KML_Geometry.h"
    1615class KML_LinearRing;
  • issm/trunk-jpl/src/c/classes/KML/KML_Style.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Style.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_StyleSelector.h"
    1413class KML_LineStyle;
  • issm/trunk-jpl/src/c/classes/KML/KML_StyleSelector.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
     
    4340}
    4441/*}}}*/
    45 
    4642/*FUNCTION KML_StyleSelector::DeepEcho {{{*/
    4743void  KML_StyleSelector::DeepEcho(){
     
    5450}
    5551/*}}}*/
    56 
    5752/*FUNCTION KML_StyleSelector::DeepEcho {{{*/
    5853void  KML_StyleSelector::DeepEcho(const char* indent){
     
    6358}
    6459/*}}}*/
    65 
    6660/*FUNCTION KML_StyleSelector::Write {{{*/
    6761void  KML_StyleSelector::Write(FILE* filout,const char* indent){
     
    7266}
    7367/*}}}*/
    74 
    7568/*FUNCTION KML_StyleSelector::Read {{{*/
    7669void  KML_StyleSelector::Read(FILE* fid,char* kstr){
  • issm/trunk-jpl/src/c/classes/KML/KML_StyleSelector.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Object.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_SubStyle.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
     
    4340}
    4441/*}}}*/
    45 
    4642/*FUNCTION KML_SubStyle::DeepEcho {{{*/
    4743void  KML_SubStyle::DeepEcho(){
     
    5450}
    5551/*}}}*/
    56 
    5752/*FUNCTION KML_SubStyle::DeepEcho {{{*/
    5853void  KML_SubStyle::DeepEcho(const char* indent){
     
    6358}
    6459/*}}}*/
    65 
    6660/*FUNCTION KML_SubStyle::Write {{{*/
    6761void  KML_SubStyle::Write(FILE* filout,const char* indent){
     
    7266}
    7367/*}}}*/
    74 
    7568/*FUNCTION KML_SubStyle::Read {{{*/
    7669void  KML_SubStyle::Read(FILE* fid,char* kstr){
  • issm/trunk-jpl/src/c/classes/KML/KML_SubStyle.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Object.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/KML/KML_Unknown.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../shared/io/io.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/KML/KML_Unknown.h

    r14960 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../../../shared/Exceptions/exceptions.h"
    11 #include "../../../shared/Enum/Enum.h"
    12 
     10#include "../../shared/Exceptions/exceptions.h"
     11#include "../../shared/Enum/Enum.h"
    1312#include "./KML_Object.h"
    1413/*}}}*/
  • issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Loads/Load.h

    r14975 r15012  
    2121
    2222#include "../Object.h"
    23 #include "../../Update.h"
     23#include "../Update.h"
    2424
    2525/*}}}*/
  • issm/trunk-jpl/src/c/classes/Loads/Loads.cpp

    r14996 r15012  
    1414#include <functional>
    1515#include <algorithm>
    16 #include <iostream>
    1716
    1817#include "./Loads.h"
    19 #include "../../../shared/shared.h"
    2018#include "./Load.h"
     19#include "../../shared/shared.h"
    2120
    2221using namespace std;
  • issm/trunk-jpl/src/c/classes/Loads/Numericalflux.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../../shared/Enum/Enum.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../classes.h"
     13#include "shared/shared.h"
     14#include "../classes.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../classes.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp

    r14960 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../../../shared/Enum/Enum.h"
    16 #include "../../../shared/shared.h"
    17 #include "../../../modules/ModelProcessorx/ModelProcessorx.h"
    18 #include "../../classes.h"
     13#include "shared/shared.h"
     14#include "modules/ModelProcessorx/ModelProcessorx.h"
     15#include "../classes.h"
    1916/*}}}*/
    2017
  • issm/trunk-jpl/src/c/classes/Materials/Matdamageice.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "shared/shared.h"
    1613
    1714/*Matdamageice constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Materials/Material.h

    r14996 r15012  
    1111template <class doubletype> class Vector;
    1212#include "../Object.h"
    13 #include "../../Update.h"
     13#include "../Update.h"
    1414class Elements;
    1515/*}}}*/
  • issm/trunk-jpl/src/c/classes/Materials/Materials.cpp

    r14996 r15012  
    1212
    1313#include "./Materials.h"
    14 #include "../../../shared/shared.h"
    1514#include "./Material.h"
     15#include "../../shared/shared.h"
    1616
    1717using namespace std;
  • issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    1311#include "./Matice.h"
    1412#include "./Materials.h"
     
    2220#include "../Elements/Penta.h"
    2321#include "../Params/Parameters.h"
    24 #include "../../Hook.h"
     22#include "../Hook.h"
    2523#include "../Node.h"
    26 #include "../../IoModel.h"
    27 #include "../../../shared/shared.h"
     24#include "../IoModel.h"
     25#include "../../shared/shared.h"
    2826
    2927/*Matice constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Materials/Matice.h

    r14996 r15012  
    99/*{{{*/
    1010#include "./Material.h"
    11 #include "../../Hook.h"
     11#include "../Hook.h"
    1212class IoModel;
    13                
    1413class Elements;
    1514class Loads;
     
    1817class Materials;
    1918class Parameters;
    20 
    2119/*}}}*/
    2220
  • issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

    r14960 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../../classes.h"
    14 #include "../../../shared/shared.h"
    15 #include "../../../shared/Enum/Enum.h"
     11#include "../classes.h"
     12#include "../../shared/shared.h"
    1613
    1714/*Matpar constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Node.cpp

    r15011 r15012  
    1010#endif
    1111
    12 #include <stdio.h>
    13 #include <string.h>
    14 #include "./objects.h"
    15 #include "../../shared/Enum/Enum.h"
    16 #include "../../shared/shared.h"
    17 #include "../../modules/ModelProcessorx/ModelProcessorx.h"
     12#include "./classes.h"
     13#include "shared/shared.h"
     14#include "modules/ModelProcessorx/ModelProcessorx.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Node.h

    r15011 r15012  
    99/*{{{*/
    1010#include "./Object.h"
    11 #include "../../shared/shared.h"
    12 #include "../DofIndexing.h"
     11#include "../shared/shared.h"
     12#include "./DofIndexing.h"
    1313class  Inputs;
    1414class  Hook;
     
    2020class ElementVector;
    2121class ElementMatrix;
    22 #include "../Update.h"
     22#include "Update.h"
    2323/*}}}*/
    2424
  • issm/trunk-jpl/src/c/classes/Nodes.cpp

    r15011 r15012  
    1212
    1313#include "./Nodes.h"
    14 #include "../../shared/shared.h"
     14#include "../shared/shared.h"
    1515#include "./Node.h"
    1616
  • issm/trunk-jpl/src/c/classes/Options/GenericOption.h

    r14975 r15012  
    1414
    1515#include <cstring>
    16 
    17 #include "../../../shared/Exceptions/exceptions.h"
    18 #include "../../../shared/MemOps/MemOps.h"
    19 #include "../../../shared/shared.h"
     16#include "../../shared/shared.h"
    2017#include "./OptionUtilities.h"
    21 
    2218#include "../Object.h"
    2319/*}}}*/
  • issm/trunk-jpl/src/c/classes/Options/Option.h

    r14960 r15012  
    77
    88/*Headers:{{{*/
    9 #include "../../../shared/Exceptions/exceptions.h"
    10 #include "../../../shared/Enum/Enum.h"
    11 
     9#include "../../shared/Exceptions/exceptions.h"
     10#include "../../shared/Enum/Enum.h"
    1211#include "../Object.h"
    1312/*}}}*/
  • issm/trunk-jpl/src/c/classes/Options/OptionUtilities.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Options/OptionUtilities.h

    r14960 r15012  
    77
    88/*Headers:{{{*/
    9 #include "../../../shared/Exceptions/exceptions.h"
    10 #include "../../../shared/Enum/Enum.h"
     9#include "../../shared/Exceptions/exceptions.h"
     10#include "../../shared/Enum/Enum.h"
    1111
    1212#include "./Option.h"
  • issm/trunk-jpl/src/c/classes/Options/Options.cpp

    r14996 r15012  
    1717#include "../DataSet.h"
    1818#include "./Options.h"
    19 #include "../../../shared/shared.h"
     19#include "../../shared/shared.h"
    2020/*}}}*/
    2121
  • issm/trunk-jpl/src/c/classes/Params/BoolParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/BoolParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/DataSetParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/DoubleMatArrayParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/DoubleMatArrayParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/DoubleMatParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/DoubleMatParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/DoubleParam.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../objects.h"
    14 #include "../../../shared/Enum/Enum.h"
    15 #include "../../../shared/shared.h"
     11#include "../classes.h"
     12#include "shared/shared.h"
    1613
    1714/*DoubleParam constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/Params/DoubleParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/DoubleTransientMatParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/DoubleTransientMatParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/DoubleVecParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/DoubleVecParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/FileParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/FileParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/GenericParam.h

    r14960 r15012  
    1616#endif
    1717#include "./Param.h"
    18 #include "../../../shared/shared.h"
    19 #include "../../../shared/Enum/Enum.h"
     18#include "../../shared/shared.h"
    2019
    2120/**
  • issm/trunk-jpl/src/c/classes/Params/IntMatParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/Enum/Enum.h"
    17 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "shared/shared.h"
    1815/*}}}*/
    1916
  • issm/trunk-jpl/src/c/classes/Params/IntMatParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/IntParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/IntParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/IntVecParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/IntVecParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/MatrixParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/MatrixParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

    r14996 r15012  
    3232#include "./StringParam.h"
    3333
    34 #include "../../../shared/shared.h"
    35 #include "../../../toolkits/toolkits.h"
     34#include "../../shared/shared.h"
     35#include "../../toolkits/toolkits.h"
    3636
    3737using namespace std;
  • issm/trunk-jpl/src/c/classes/Params/Parameters.h

    r14996 r15012  
    77template <class doubletype> class Vector;
    88#include "../DataSet.h"
    9 #include "../../../shared/shared.h"
     9#include "../../shared/shared.h"
    1010
    1111/*!\brief Declaration of Parameters class. 
  • issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/StringArrayParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/StringParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/StringParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/TransientParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Params/VectorParam.cpp

    r14996 r15012  
    1111#endif
    1212
    13 #include <stdio.h>
    14 #include <string.h>
    15 #include "../objects.h"
    16 #include "../../../shared/shared.h"
     13#include "../classes.h"
     14#include "../../shared/shared.h"
    1715/*}}}*/
    1816
  • issm/trunk-jpl/src/c/classes/Params/VectorParam.h

    r14917 r15012  
    1515
    1616#include "./Param.h"
    17 #include "../../../shared/shared.h"
     17#include "../../shared/shared.h"
    1818/*}}}*/
    1919
  • issm/trunk-jpl/src/c/classes/Profiler.cpp

    r15011 r15012  
    1313#include "./Params/Parameters.h"
    1414#include "./Params/DoubleParam.h"
    15 #include "../../toolkits/toolkits.h"
     15#include "../toolkits/toolkits.h"
    1616/*}}}*/
    1717
  • issm/trunk-jpl/src/c/classes/Profiler.h

    r15011 r15012  
    99/*{{{*/
    1010#include "./Object.h"
    11 #include "../../shared/shared.h"
     11#include "../shared/shared.h"
    1212/*}}}*/
    1313
  • issm/trunk-jpl/src/c/classes/Segment.h

    r15011 r15012  
    99/*{{{*/
    1010#include "./Object.h"
    11 #include "../../shared/Numerics/constants.h"
     11#include "../shared/Numerics/constants.h"
    1212/*}}}*/
    1313
  • issm/trunk-jpl/src/c/classes/Vertex.cpp

    r15011 r15012  
    1111
    1212#include <string.h>
    13 #include "../classes.h"
    14 #include "../../shared/shared.h"
     13#include "classes.h"
     14#include "shared/shared.h"
    1515/*}}}*/
    1616
  • issm/trunk-jpl/src/c/classes/Vertex.h

    r15011 r15012  
    88/*Headers:*/
    99/*{{{*/
    10 #include "../classes.h"
    11 #include "../../shared/Exceptions/exceptions.h"
    12 #include "../../toolkits/toolkits.h"
     10#include "./classes.h"
     11#include "../shared/Exceptions/exceptions.h"
     12#include "../toolkits/toolkits.h"
    1313template <class doubletype> class Vector;
    1414template <class doubletype> class Matrix;
  • issm/trunk-jpl/src/c/classes/Vertices.cpp

    r15011 r15012  
    1717
    1818#include "./Vertices.h"
    19 #include "../../shared/shared.h"
     19#include "../shared/shared.h"
    2020#include "./Vertex.h"
    2121
  • issm/trunk-jpl/src/c/classes/Vertices.h

    r15011 r15012  
    44/*forward declarations */
    55#include "./DataSet.h"
    6 #include "../../shared/shared.h"
     6#include "../shared/shared.h"
    77
    88/*!\brief Declaration of Vertices class.
  • issm/trunk-jpl/src/c/classes/bamg/BamgGeom.cpp

    r14950 r15012  
    1 #include <stdio.h>
    2 #include "../objects/objects.h"
    3 #include "../../shared/io/io.h"
     1#include "../classes.h"
    42#include "../../shared/shared.h"
    53
  • issm/trunk-jpl/src/c/classes/bamg/BamgMesh.cpp

    r14950 r15012  
    1 #include <stdio.h>
    2 #include "../objects/objects.h"
    3 #include "../../shared/io/io.h"
     1#include "../classes.h"
    42#include "../../shared/shared.h"
    53
  • issm/trunk-jpl/src/c/classes/bamg/BamgOpts.cpp

    r14950 r15012  
    1 #include <stdio.h>
     1#include "../classes.h"
    22#include "../../shared/shared.h"
    3 #include "../objects/objects.h"
    4 #include "../../shared/io/io.h"
    53
    64/*Constructors/Destructors*/
  • issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.cpp

    r13622 r15012  
    33#include <stdlib.h>
    44
    5 #include "../objects/objects.h"
     5#include "../classes.h"
    66
    77namespace bamg {
  • issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.h

    r13414 r15012  
    44
    55#include "./include.h"
    6 #include "../objects/Object.h"
     6#include "../Object.h"
    77class DataSet;
    88
  • issm/trunk-jpl/src/c/classes/bamg/BamgVertex.cpp

    r14949 r15012  
    44#include <ctime>
    55
    6 #include "../objects/objects.h"
     6#include "../classes.h"
    77#include "./det.h"
    88
  • issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp

    r14917 r15012  
    44#include <ctime>
    55
    6 #include "../objects/objects.h"
     6#include "../classes.h"
    77#include "../../shared/Exceptions/exceptions.h"
    88
  • issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.cpp

    r14949 r15012  
    44#include <ctime>
    55
    6 #include "../objects/objects.h"
     6#include "../classes.h"
    77#include "./det.h"
    88
  • issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp

    r14949 r15012  
    44#include <ctime>
    55
    6 #include "../objects/objects.h"
     6#include "../classes.h"
    77#include "./det.h"
    88
  • issm/trunk-jpl/src/c/classes/bamg/SetOfE4.cpp

    r13530 r15012  
    1 #include "../objects/objects.h"
     1#include "../classes.h"
    22
    33using namespace std;
  • issm/trunk-jpl/src/c/classes/bamg/Triangle.cpp

    r14949 r15012  
    44#include <ctime>
    55
    6 #include "../objects/objects.h"
     6#include "../classes.h"
    77#include "./det.h"
    88
  • issm/trunk-jpl/src/c/classes/classes.h

    r15009 r15012  
    33 */
    44
    5 #ifndef ALL_CLASSES_H_
    6 #define ALL_CLASSES_H_
     5#ifndef _ALL_CLASSES_H_
     6#define _ALL_CLASSES_H_
    77
    8 /*Objects derived classes, which are used in our containers: */
    9 #include "./objects/objects.h"
     8/*Abstract classes: */
     9#include "./Object.h"
     10#include "./DataSet.h"
     11
     12/*Objects: */
     13#include "./Contour.h"
     14#include "./Vertices.h"
     15#include "./Vertex.h"
     16#include "./Nodes.h"
     17#include "./Node.h"
     18#include "./Profiler.h"
     19#include "./DependentObject.h"
     20#include "./IndependentObject.h"
     21#include "./Segment.h"
     22#include "./Bucket.h"
     23
     24/*Constraints: */
     25#include "./Constraints/Constraints.h"
     26#include "./Constraints/Constraint.h"
     27#include "./Constraints/SpcStatic.h"
     28#include "./Constraints/SpcTransient.h"
     29#include "./Constraints/SpcDynamic.h"
     30
     31/*Loads: */
     32#include "./Loads/Loads.h"
     33#include "./Loads/Load.h"
     34#include "./Loads/Friction.h"
     35#include "./Loads/Icefront.h"
     36#include "./Loads/Numericalflux.h"
     37#include "./Loads/Riftfront.h"
     38#include "./Loads/Penpair.h"
     39#include "./Loads/Pengrid.h"
     40
     41/*Elements: */
     42#include "./Elements/Elements.h"
     43#include "./Elements/Element.h"
     44#include "./Elements/Penta.h"
     45#include "./Elements/PentaHook.h"
     46#include "./Elements/PentaRef.h"
     47#include "./Elements/Tria.h"
     48#include "./Elements/TriaHook.h"
     49#include "./Elements/TriaRef.h"
     50
     51/*KML parsing objects: */
     52#include "./KML/KML_Attribute.h"
     53#include "./KML/KML_Comment.h"
     54#include "./KML/KML_ColorStyle.h"
     55#include "./KML/KML_Container.h"
     56#include "./KML/KML_Document.h"
     57#include "./KML/KML_Feature.h"
     58#include "./KML/KML_File.h"
     59#include "./KML/KML_Folder.h"
     60#include "./KML/KML_Geometry.h"
     61#include "./KML/KML_GroundOverlay.h"
     62#include "./KML/KML_Icon.h"
     63#include "./KML/KML_LatLonBox.h"
     64#include "./KML/KML_LinearRing.h"
     65#include "./KML/KML_LineString.h"
     66#include "./KML/KML_LineStyle.h"
     67#include "./KML/KML_MultiGeometry.h"
     68#include "./KML/KML_Object.h"
     69#include "./KML/KML_Overlay.h"
     70#include "./KML/KML_Point.h"
     71#include "./KML/KML_Placemark.h"
     72#include "./KML/KML_Polygon.h"
     73#include "./KML/KML_PolyStyle.h"
     74#include "./KML/KML_Style.h"
     75#include "./KML/KML_StyleSelector.h"
     76#include "./KML/KML_SubStyle.h"
     77#include "./KML/KML_Unknown.h"
     78#include "./KML/KMLFileReadUtils.h"
     79
     80/*Option parsing objects: */
     81#include "./Options/Option.h"
     82#include "./Options/Options.h"
     83#include "./Options/GenericOption.h"
     84#include "./Options/OptionUtilities.h"
     85
     86/*Inputs: */
     87#include "./Inputs/Inputs.h"
     88#include "./Inputs/Input.h"
     89#include "./Inputs/BoolInput.h"
     90#include "./Inputs/DoubleInput.h"
     91#include "./Inputs/IntInput.h"
     92#include "./Inputs/PentaP1Input.h"
     93#include "./Inputs/TriaP1Input.h"
     94#include "./Inputs/ControlInput.h"
     95#include "./Inputs/DatasetInput.h"
     96#include "./Inputs/TransientInput.h"
     97
     98/*ElementResults: */
     99#include "./ElementResults/ElementResult.h"
     100#include "./ElementResults/DoubleElementResult.h"
     101#include "./ElementResults/TriaP1ElementResult.h"
     102#include "./ElementResults/PentaP1ElementResult.h"
     103#include "./ElementResults/BoolElementResult.h"
     104
     105/*ExternalResults: */
     106#include "./ExternalResults/Results.h"
     107#include "./ExternalResults/ExternalResult.h"
     108#include "./ExternalResults/GenericExternalResult.h"
     109
     110/*Materials: */
     111#include "./Materials/Materials.h"
     112#include "./Materials/Material.h"
     113#include "./Materials/Matice.h"
     114#include "./Materials/Matdamageice.h"
     115#include "./Materials/Matpar.h"
     116
     117/*Params: */
     118#include "./Params/GenericParam.h"
     119#include "./Params/BoolParam.h"
     120#include "./Params/DoubleMatParam.h"
     121#include "./Params/DoubleTransientMatParam.h"
     122#include "./Params/DoubleMatArrayParam.h"
     123#include "./Params/DoubleParam.h"
     124#include "./Params/DoubleVecParam.h"
     125#include "./Params/IntParam.h"
     126#include "./Params/IntVecParam.h"
     127#include "./Params/IntMatParam.h"
     128#include "./Params/FileParam.h"
     129#include "./Params/Parameters.h"
     130#include "./Params/Param.h"
     131#include "./Params/MatrixParam.h"
     132#include "./Params/VectorParam.h"
     133#include "./Params/StringArrayParam.h"
     134#include "./Params/StringParam.h"
     135#include "./Params/TransientParam.h"
     136#include "./Params/DataSetParam.h"
    10137
    11138/*matrix: */
  • issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../objects/objects.h"
     11#include "../classes.h"
    1412#include "../../shared/shared.h"
    1513
  • issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../objects/objects.h"
     11#include "../classes.h"
    1412#include "../../shared/shared.h"
    1513
  • issm/trunk-jpl/src/c/classes/kriging/Observation.cpp

    r13761 r15012  
    44
    55#include <stdlib.h>
    6 #include "../objects/objects.h"
     6#include "../classes.h"
    77
    88/*Observation constructors and destructor*/
  • issm/trunk-jpl/src/c/classes/kriging/Observation.h

    r13414 r15012  
    66#define _OBSERVATION_H_
    77
    8 #include "../objects/Object.h"
     8#include "../Object.h"
    99
    1010class Observation: public Object{
  • issm/trunk-jpl/src/c/classes/kriging/Observations.cpp

    r14997 r15012  
    1616#include <iostream>
    1717
    18 #include "../objects/DataSet.h"
    19 #include "../objects/Options/Options.h"
     18#include "../DataSet.h"
     19#include "../Options/Options.h"
    2020#include "./Observations.h"
    2121#include "./Observation.h"
  • issm/trunk-jpl/src/c/classes/kriging/Observations.h

    r14996 r15012  
    55class Variogram;
    66class Options;
    7 #include "../objects/DataSet.h"
     7#include "../DataSet.h"
    88#include "../../shared/shared.h"
    99
  • issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../objects/objects.h"
     11#include "../classes.h"
    1412#include "../../shared/shared.h"
    1513
  • issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp

    r13530 r15012  
    1 #include "../objects/objects.h"
     1#include "../classes.h"
    22
    33/*DOCUMENTATION What is a Quadtree? {{{
  • issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp

    r14996 r15012  
    99#endif
    1010
    11 #include <stdio.h>
    12 #include <string.h>
    13 #include "../objects/objects.h"
     11#include "../classes.h"
    1412#include "../../shared/shared.h"
    1513
  • issm/trunk-jpl/src/c/classes/kriging/Variogram.h

    r12832 r15012  
    66#define _VARIOGRAM_H_
    77
    8 #include "../objects/Object.h"
     8#include "../Object.h"
    99
    1010class Variogram: public Object{
  • issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.h

    r14960 r15012  
    1111/*Headers:*/
    1212/*{{{*/
    13 #include "../objects/Object.h"
     13#include "../Object.h"
    1414#include "../../toolkits/toolkits.h"
    1515#include "../../shared/Enum/Enum.h"
  • issm/trunk-jpl/src/c/classes/matrix/ElementVector.h

    r14960 r15012  
    1111/*Headers:*/
    1212/*{{{*/
    13 #include "../objects/Object.h"
     13#include "../Object.h"
    1414#include "../../toolkits/toolkits.h"
    1515#include "../../shared/Enum/Enum.h"
  • issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h

    r14996 r15012  
    2121#include "../../shared/MemOps/MemOps.h"
    2222#include "../../shared/io/Comm/Comm.h"
    23 #include "../../classes/objects/DataSet.h"
    24 #include "../../classes/objects/Bucket.h"
     23#include "../../classes/DataSet.h"
     24#include "../../classes/Bucket.h"
    2525#include "../mumps/mumpsincludes.h"
    2626#include "./IssmMpiVec.h"
Note: See TracChangeset for help on using the changeset viewer.