Skip to content

Commit

Permalink
MOM6: Merge pull request #820 from adcroft/fix-doxy-1.8.4
Browse files Browse the repository at this point in the history
- Updating for dev-master-candidate-2018-07-16 PR to dev/master

- NOAA-GFDL/MOM6@82a8f79 Merge pull request #820 from adcroft/fix-doxy-1.8.4
- NOAA-GFDL/MOM6@f7be32d Fixed documentation in MOM_debugging
- NOAA-GFDL/MOM6@6478c01 Fixes for doxumentation using doxygen 1.8.4
- NOAA-GFDL/MOM6@f69cbf7 Doxygen config: only process ocean_model_MOM.F90 from coupled_driver
- NOAA-GFDL/MOM6@4061b7a Merge pull request #819 from Hallberg-NOAA/fix_dOxyGen7
- NOAA-GFDL/MOM6@d4b4edc Merge pull request #817 from Hallberg-NOAA/fix_dOxyGen6
- NOAA-GFDL/MOM6@6519f25 Merge pull request #818 from adcroft/even-more-doxy
- NOAA-GFDL/MOM6@7c4d684 Module dOxyGenization for framework code
- NOAA-GFDL/MOM6@4bd838e Module dOxyGenization for tracer code
- NOAA-GFDL/MOM6@1f1c7c8 Module dOxyGenization for EOS code
- NOAA-GFDL/MOM6@189d7d3 Corrected whitespace in circle_obcs
- NOAA-GFDL/MOM6@574af33 Adds module summary lines in src/ALE, src/user, src/parameterizations/vertical
- NOAA-GFDL/MOM6@de13a2c Module dOxyGenization for MOM_transribe_grid
- NOAA-GFDL/MOM6@0431fd7 Module dOxyGenization for MOM_dynamics_unsplit
- NOAA-GFDL/MOM6@f3b818b Module dOxyGenization for MOM_checksum_packages
- NOAA-GFDL/MOM6@c621b54 Module dOxyGenization for MOM
- NOAA-GFDL/MOM6@0da8297 Module dOxyGenization for MOM_variables & vertGrid
- NOAA-GFDL/MOM6@59bb93a Regenerated Doxygen configuration file with v1.8.15
- NOAA-GFDL/MOM6@922be4f Merge pull request #816 from adcroft/more-final-doxy
- NOAA-GFDL/MOM6@ec4fe6e Fix CPP-related doxygen errors in MOM_barotropic.F90
- NOAA-GFDL/MOM6@010f103 Shortened doxygen titles
  • Loading branch information
adcroft committed Jul 26, 2018
1 parent ed36e93 commit 78cfb2d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 94 files
+27 −34 config_src/coupled_driver/coupler_util.F90
+14 −90 config_src/coupled_driver/ocean_model_MOM.F90
+27 −41 config_src/solo_driver/MESO_surface_forcing.F90
+4 −3 config_src/solo_driver/Neverland_surface_forcing.F90
+6 −5 config_src/solo_driver/coupler_types.F90
+25 −34 config_src/solo_driver/coupler_util.F90
+29 −44 config_src/solo_driver/user_surface_forcing.F90
+82 −55 docs/Doxyfile_nortd
+5 −3 src/ALE/MOM_ALE.F90
+36 −62 src/ALE/P1M_functions.F90
+85 −117 src/ALE/P3M_functions.F90
+12 −27 src/ALE/PCM_functions.F90
+22 −45 src/ALE/PLM_functions.F90
+49 −92 src/ALE/PQM_functions.F90
+22 −41 src/ALE/polynomial_functions.F90
+31 −43 src/ALE/regrid_edge_slopes.F90
+110 −141 src/ALE/regrid_edge_values.F90
+9 −10 src/ALE/regrid_interp.F90
+16 −28 src/ALE/regrid_solvers.F90
+14 −11 src/core/MOM.F90
+65 −78 src/core/MOM_barotropic.F90
+3 −5 src/core/MOM_checksum_packages.F90
+28 −98 src/core/MOM_dynamics_unsplit.F90
+22 −85 src/core/MOM_dynamics_unsplit_RK2.F90
+5 −4 src/core/MOM_forcing_type.F90
+2 −0 src/core/MOM_transcribe_grid.F90
+48 −56 src/core/MOM_variables.F90
+19 −35 src/core/MOM_verticalGrid.F90
+10 −35 src/diagnostics/MOM_PointAccel.F90
+25 −51 src/diagnostics/MOM_debugging.F90
+7 −44 src/diagnostics/MOM_diag_to_Z.F90
+3 −22 src/diagnostics/MOM_diagnostics.F90
+19 −48 src/diagnostics/MOM_sum_output.F90
+33 −56 src/diagnostics/MOM_wave_structure.F90
+136 −135 src/equation_of_state/MOM_EOS_NEMO.F90
+2 −1 src/equation_of_state/MOM_EOS_TEOS10.F90
+3 −2 src/equation_of_state/MOM_EOS_UNESCO.F90
+3 −0 src/equation_of_state/MOM_EOS_Wright.F90
+1 −0 src/equation_of_state/MOM_TFreeze.F90
+6 −5 src/framework/MOM_checksums.F90
+21 −17 src/framework/MOM_coms.F90
+3 −6 src/framework/MOM_diag_mediator.F90
+13 −11 src/framework/MOM_diag_remap.F90
+5 −10 src/framework/MOM_document.F90
+2 −3 src/framework/MOM_domains.F90
+2 −0 src/framework/MOM_dyn_horgrid.F90
+14 −21 src/framework/MOM_error_handler.F90
+33 −32 src/framework/MOM_file_parser.F90
+2 −7 src/framework/MOM_intrinsic_functions.F90
+1 −41 src/framework/MOM_restart.F90
+1 −0 src/framework/MOM_spatial_means.F90
+9 −10 src/framework/MOM_string_functions.F90
+13 −14 src/framework/MOM_write_cputime.F90
+7 −9 src/ice_shelf/MOM_ice_shelf_initialize.F90
+2 −4 src/initialization/MOM_tracer_initialization_from_Z.F90
+34 −40 src/parameterizations/lateral/MOM_tidal_forcing.F90
+7 −5 src/parameterizations/vertical/MOM_ALE_sponge.F90
+19 −34 src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+30 −42 src/parameterizations/vertical/MOM_diabatic_aux.F90
+2 −7 src/parameterizations/vertical/MOM_diapyc_energy_req.F90
+30 −45 src/parameterizations/vertical/MOM_energetic_PBL.F90
+32 −48 src/parameterizations/vertical/MOM_entrain_diffusive.F90
+21 −22 src/parameterizations/vertical/MOM_kappa_shear.F90
+18 −33 src/parameterizations/vertical/MOM_opacity.F90
+8 −96 src/parameterizations/vertical/MOM_regularize_layers.F90
+10 −8 src/parameterizations/vertical/MOM_set_diffusivity.F90
+6 −19 src/parameterizations/vertical/MOM_shortwave_abs.F90
+34 −52 src/parameterizations/vertical/MOM_sponge.F90
+18 −35 src/tracer/DOME_tracer.F90
+6 −12 src/tracer/ISOMIP_tracer.F90
+11 −47 src/tracer/MOM_OCMIP2_CFC.F90
+1 −21 src/tracer/MOM_tracer_Z_init.F90
+1 −0 src/tracer/MOM_tracer_flow_control.F90
+2 −36 src/tracer/advection_test_tracer.F90
+9 −34 src/tracer/dye_example.F90
+15 −30 src/tracer/dyed_obc_tracer.F90
+13 −37 src/tracer/ideal_age_example.F90
+16 −37 src/tracer/oil_tracer.F90
+11 −33 src/tracer/pseudo_salt_tracer.F90
+15 −33 src/tracer/tracer_example.F90
+1 −0 src/user/DOME2d_initialization.F90
+2 −4 src/user/DOME_initialization.F90
+5 −6 src/user/Kelvin_initialization.F90
+16 −24 src/user/Neverland_initialization.F90
+33 −45 src/user/Phillips_initialization.F90
+6 −16 src/user/benchmark_initialization.F90
+2 −4 src/user/circle_obcs_initialization.F90
+8 −13 src/user/external_gwave_initialization.F90
+2 −4 src/user/lock_exchange_initialization.F90
+1 −4 src/user/seamount_initialization.F90
+1 −4 src/user/shelfwave_initialization.F90
+1 −0 src/user/sloshing_initialization.F90
+1 −0 src/user/supercritical_initialization.F90
+2 −4 src/user/tidal_bay_initialization.F90

0 comments on commit 78cfb2d

Please sign in to comment.