diff --git a/bin/tools/doxyFilter.sed b/bin/tools/doxyFilter.sed index e2aecb8b8d..f3bec2901f 100644 --- a/bin/tools/doxyFilter.sed +++ b/bin/tools/doxyFilter.sed @@ -175,7 +175,7 @@ s/.*\*\//\*\// # convert /heading in source files to bold font and add some space -s#\\heading \(.*\)#
\1#g +s#\\heading \(.*\)#
\1
#g # add a linebreak s#\\linebreak#
#g diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile index ddbe275ff9..4e86e5338d 100644 --- a/doc/Doxygen/Doxyfile +++ b/doc/Doxygen/Doxyfile @@ -769,6 +769,10 @@ INPUT = $(WM_PROJECT_DIR)/src \ $(WM_PROJECT_DIR)/applications/utilities \ $(WM_PROJECT_DIR)/applications/solvers +#For testing only +#INPUT = $(WM_PROJECT_DIR)/src/OpenFOAM/global \ +# $(WM_PROJECT_DIR)/applications/solvers/incompressible + # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # libiconv (or the iconv built into libc) for the transcoding. See the libiconv @@ -1172,7 +1176,7 @@ HTML_DYNAMIC_SECTIONS = NO # Minimum value: 0, maximum value: 9999, default value: 100. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_INDEX_NUM_ENTRIES = 100 +HTML_INDEX_NUM_ENTRIES = 2 # If the GENERATE_DOCSET tag is set to YES, additional index files will be # generated that can be used as input for Apple's Xcode 3 integrated development @@ -1421,7 +1425,7 @@ EXT_LINKS_IN_WINDOW = NO # Minimum value: 8, maximum value: 50, default value: 10. # This tag requires that the tag GENERATE_HTML is set to YES. -FORMULA_FONTSIZE = 10 +FORMULA_FONTSIZE = 12 # Use the FORMULA_TRANPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not diff --git a/doc/Doxygen/_Footer b/doc/Doxygen/_Footer index abac826396..e558a423e7 100644 --- a/doc/Doxygen/_Footer +++ b/doc/Doxygen/_Footer @@ -2,7 +2,7 @@

- Copyright © 2011-2013  + Copyright © 2011-2016  OpenFOAM | OPENFOAM® is a registered diff --git a/doc/Doxygen/css/cfdLayout.css b/doc/Doxygen/css/cfdLayout.css index b00bd68da4..f803ce8802 100644 --- a/doc/Doxygen/css/cfdLayout.css +++ b/doc/Doxygen/css/cfdLayout.css @@ -71,7 +71,7 @@ p:after { border:3px solid rgb(175,175,175); border-bottom-width: 0; margin-top:10px; - background:#e1f0e1; + background:#d5e1f0; overflow:visible !important /*Firefox*/; overflow:hidden /*IE6*/; } @@ -265,12 +265,12 @@ p:after { } div.contents a { - color:rgb(85,144,112); + color:rgb(70,122,167); font-weight:bold; text-decoration:none; } div.contents a:hover { - color:rgb(56,94,73); + color:rgb(42,90,138); text-decoration:underline; } /* @@ -342,3 +342,4 @@ div.crosslinks { } } /* end media print */ + diff --git a/doc/Doxygen/css/cfdNav.css b/doc/Doxygen/css/cfdNav.css index 662442034f..6e37717c58 100644 --- a/doc/Doxygen/css/cfdNav.css +++ b/doc/Doxygen/css/cfdNav.css @@ -271,7 +271,7 @@ nav3-bullet padding:0 0 0 10px; background:url(img/bg_bullet_full_1.gif) no-repeat 0px 50%; text-decoration:none; - color:rgb(56,94,73); + color:rgb(70,122,167); font-weight:bold; font-size:120%; } @@ -282,7 +282,7 @@ nav3-bullet padding:0 0 0 10px; background:url(img/bg_bullet_half_1.gif) no-repeat 0px 50%; text-decoration:none; - color:rgb(56,94,73); + color:rgb(70,122,167); font-weight:normal; font-size:120%; } @@ -570,3 +570,4 @@ div.navpath, div.summary { background-color:#d5e1f0 !important; } + diff --git a/doc/Doxygen/css/doxyMod.css b/doc/Doxygen/css/doxyMod.css index 11407eedd7..fd250189cb 100644 --- a/doc/Doxygen/css/doxyMod.css +++ b/doc/Doxygen/css/doxyMod.css @@ -86,15 +86,34 @@ tr.memlist } .OFTable th { + height:20px; text-align: left; padding: 5px; border-bottom: 2px solid rgb(175,175,175); } -.OFTable td { +.OFTable tr td { + height:20px; padding-left: 5px; } +.OFPlainTable { + border: 0px; + margin-top: 10px; + margin-bottom: 10px; +/* background-color: #F0F0F0; */ +/* padding: 3px 7px 2px; */ +} + +.OFPlainTable th { + height: 20px; + text-align: left; +/* padding: 5px; */ +} + +.OFPlainTable tr td { + height: 20px; + padding-left: 5px; div.line, span.comment, span.keyword, diff --git a/doc/Doxygen/css/doxygen.css b/doc/Doxygen/css/doxygen.css index 4958570ce3..d8eb269cc7 100644 --- a/doc/Doxygen/css/doxygen.css +++ b/doc/Doxygen/css/doxygen.css @@ -86,13 +86,13 @@ div.navtab { /* @group Link Styling */ a { - color: rgb(85,144,112); + color: #153788; font-weight: normal; text-decoration: none; } .contents a:visited { - color: rgb(85,144,112); + color: #1b77c5; } a:hover { @@ -546,7 +546,7 @@ table.doxtable { } table.doxtable td, table.doxtable th { - border: 1px solid rgb(85,144,112); + border: 1px solid #153788; padding: 3px 7px 2px; } diff --git a/doc/Doxygen/css/img/OpenFOAMlogo.png b/doc/Doxygen/css/img/OpenFOAMlogo.png index 6d9e2f698b..722febb968 100644 Binary files a/doc/Doxygen/css/img/OpenFOAMlogo.png and b/doc/Doxygen/css/img/OpenFOAMlogo.png differ diff --git a/src/OpenFOAM/global/foamDoc.H b/src/OpenFOAM/global/foamDoc.H index 28248efd7b..73210859be 100644 --- a/src/OpenFOAM/global/foamDoc.H +++ b/src/OpenFOAM/global/foamDoc.H @@ -33,12 +33,12 @@ License and academic organisations. OpenFOAM has an extensive range of features to solve anything from complex fluid flows involving chemical reactions, turbulence and heat transfer, to solid dynamics and electromagnetics. - More ... + More ... \section layout Code Layout - The OpenFOAM source code comprises of four main components: + The OpenFOAM source code has four main components: - src: the core OpenFOAM source code @@ -56,8 +56,9 @@ License \section usingTheCode Using the code - - \subpage pagePostProcessing + - \subpage pageSolvers - \subpage pageBoundaryConditions + - \subpage pagePostProcessing \*---------------------------------------------------------------------------*/ diff --git a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H index df3671a24a..54884acdf7 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H +++ b/src/TurbulenceModels/turbulenceModels/DES/DESModel/DESModelDoc.H @@ -23,7 +23,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -\defgroup grpDESTurbulence DES +\defgroup grpDESTurbulence DES turbulence @{ \ingroup grpTurbulence This group contains DES turbulence models. diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H index 4202f5f7af..c2e558f948 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/RASBoundaryConditionsDoc.H @@ -29,11 +29,4 @@ License This group contains RAS turbulence model boundary conditions @} -\defgroup grpWallFunctions RAS wall functions -@{ - \ingroup grpRASBoundaryConditions - This group contains RAS turbulence model wall functions -@} - - \*---------------------------------------------------------------------------*/ diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H index bcf8f79f22..651e95c161 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H @@ -23,13 +23,13 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -\defgroup grpTurbulenceBoundaryConditions turbulence boundary conditions +\defgroup grpTurbulenceBoundaryConditions Turbulence boundary conditions @{ \ingroup grpTurbulence This group contains turbulence model boundary conditions @} -\defgroup grpWallFunctions wall functions +\defgroup grpWallFunctions Wall functions @{ \ingroup grpTurbulenceBoundaryConditions This group contains turbulence model wall functions