Skip to content

Commit

Permalink
MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl
Browse files Browse the repository at this point in the history
- Preparing for PR to dev/master

- NOAA-GFDL/MOM6@bf9956e Merge branch 'ESMG-dev/esmg' into dev/gfdl
- NOAA-GFDL/MOM6@fefec65 Merge branch 'dev/esmg' of https://github.com/ESMG/MOM6 into ESMG-dev/esmg
- NOAA-GFDL/MOM6@b67bd62 Merge pull request #772 from Hallberg-NOAA/sfc_diags_NaN_fix
- NOAA-GFDL/MOM6@38d5fb8 Kludge to avoid OBC feedback.
- NOAA-GFDL/MOM6@74b302a post_surface_dyn_diags & post_surface_thermo_diags
- NOAA-GFDL/MOM6@92126aa Added 'implicit none ; private' to 5 modules
- NOAA-GFDL/MOM6@cdd405d Cleaning up spacing and comments.
- NOAA-GFDL/MOM6@d7fae6e Merge pull request #765 from adcroft/fix-uninit-obc-config
- NOAA-GFDL/MOM6@38abeec Merge remote-tracking branch 'origin/user/mjh/update_htot' into dev/esmg
- NOAA-GFDL/MOM6@3aa2c43 Cleaning up @adcroft's questions about uninitialized nudging.
- NOAA-GFDL/MOM6@ffcb7e0 update segment htot
- NOAA-GFDL/MOM6@05b41be Merge pull request #766 from ESMG/dev/esmg
- NOAA-GFDL/MOM6@a783d39 Fixed a bug in MOM_CoriolisAdv.F90.
- NOAA-GFDL/MOM6@abecdf7 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
- NOAA-GFDL/MOM6@fc2b3b7 Fixed uninitialized data in OBC config code
- NOAA-GFDL/MOM6@12d2eff Merge pull request #764 from Hallberg-NOAA/code_standardization
- NOAA-GFDL/MOM6@82bde14 Fixed uninitialized data in OBC config code
- NOAA-GFDL/MOM6@c8ff495 Merge branch 'dev/gfdl' into code_standardization
- NOAA-GFDL/MOM6@345d40f dOxyGenized MOM tracer packages
- NOAA-GFDL/MOM6@1b2751e dOxyGenized MOM tracer utility codes
- NOAA-GFDL/MOM6@8e86028 dOxyGenized MOM_tracer_flow_control.F90
- NOAA-GFDL/MOM6@7c2e5be Corrected a max to a min in i2s
- NOAA-GFDL/MOM6@8b6ff3a Bug fixes to OBC dvdx code.
- NOAA-GFDL/MOM6@7a91f93 First whack at OBC radiation-nudging of tangential vel
- NOAA-GFDL/MOM6@6e018cf +Combined arguments to write_[uv]_accel
- NOAA-GFDL/MOM6@4bdfed6 Shortened excesively long lines in ice_solo_driver
- NOAA-GFDL/MOM6@881bf4c dOxyGenized Neverland_surface_forcing.F90
- NOAA-GFDL/MOM6@01b434e dOxyGenized MESO_surface_forcing.F90
- NOAA-GFDL/MOM6@7ff278e dOxyGenized user_surface_forcing.F90
- NOAA-GFDL/MOM6@5663737 dOxyGenized solo_driver/MOM_surface_forcing.F90
- NOAA-GFDL/MOM6@a4990de dOxyGenized MOM_sum_output.F90
- NOAA-GFDL/MOM6@28da3a2 dOxyGenized MOM_grid_initialization.F90
- NOAA-GFDL/MOM6@1d10503 dOxyGenized MOM_wave_structure.F90
- NOAA-GFDL/MOM6@f5fa06c dOxyGenized MOM_obsolete_diagnostics.F90
- NOAA-GFDL/MOM6@3c95708 dOxyGenized MOM_diagnostics.F90
- NOAA-GFDL/MOM6@462595f Removed trailing white space
- NOAA-GFDL/MOM6@536382e dOxyGenized MOM_write_cputime.F90
- NOAA-GFDL/MOM6@434f77c dOxyGenized MOM_string_functions.F90
- NOAA-GFDL/MOM6@397d258 dOxyGenized MOM_restart.F90
- NOAA-GFDL/MOM6@d9e8f1f dOxyGenized MOM_io.F90
- NOAA-GFDL/MOM6@396b9bc dOxyGenized MOM_intrinsic_functions.F90
- NOAA-GFDL/MOM6@6c198b7 dOxyGenized MOM_domains.F90
- NOAA-GFDL/MOM6@dc91dd0 dOxyGenized MOM_diag_remap.F90
- NOAA-GFDL/MOM6@70f96c1 dOxyGenized MOM_diag_mediator.F90
- NOAA-GFDL/MOM6@3bc5d09 Split excessively long lines in MOM_file_parser
- NOAA-GFDL/MOM6@668f13a Split excessively long lines in MOM_open_boundary
- NOAA-GFDL/MOM6@a9f84c4 Fixed some dOxygen comments in MOM_debugging.F90
- NOAA-GFDL/MOM6@999e343 gitlab: Indicates status of MOM_parameter_doc files
- NOAA-GFDL/MOM6@e8e2459 Merge branch 'dev/gfdl' into code_standardization
- NOAA-GFDL/MOM6@ce614c6 dOxyGenized MOM_spatial_means.F90
- NOAA-GFDL/MOM6@5490e5a dOxyGenized MOM_coms.F90
- NOAA-GFDL/MOM6@0116078 Merged keywords end do & end if to enddo & endif
- NOAA-GFDL/MOM6@b05e55d Merge pull request #763 from Hallberg-NOAA/code_cleanup
- NOAA-GFDL/MOM6@4adbbe3 Merge branch 'dev/gfdl' into code_cleanup
- NOAA-GFDL/MOM6@5cb839e dOxyGenized MOM_file_parser.F90
- NOAA-GFDL/MOM6@c64fc57 dOxyGenized MOM_safe_alloc.F90
- NOAA-GFDL/MOM6@bef564f dOxyGenized MOM_checksums.F90
- NOAA-GFDL/MOM6@4e9317f dOxyGenized MOM_debugging.F90
- NOAA-GFDL/MOM6@30c1b26 Eliminated trailing semicolons from MOM6 code
- NOAA-GFDL/MOM6@233f76c Removed space between arrays and indices in MOM_ice_shelf
- NOAA-GFDL/MOM6@b224da4 Removed spaces between subroutine and arguments
- NOAA-GFDL/MOM6@380574a Added dOxyGen comments in coord_ code
- NOAA-GFDL/MOM6@a9605fb Shortened long variable names in MOM_remapping.F90
- NOAA-GFDL/MOM6@0de48ec Stacked common-extent loops in MOM_ALE
- NOAA-GFDL/MOM6@5e33043 Added dOxyGen comments in ALE regridding code
- NOAA-GFDL/MOM6@fd6d837 Merge branch 'nikizadehgfdl-user/nikizadehgfdl/force_not_to_initialize_a_gtracer' into dev/gfdl
- NOAA-GFDL/MOM6@e16fb14 Cleaned up white space
- NOAA-GFDL/MOM6@f8ffe35 Merge branch 'user/nikizadehgfdl/force_not_to_initialize_a_gtracer' of https://github.com/nikizadehgfdl/MOM6 into nikizadehgfdl-user/nikizadehgfdl/force_not_to_initialize_a_gtracer
- NOAA-GFDL/MOM6@026907e Merge pull request #761 from Hallberg-NOAA/code_standardization
- NOAA-GFDL/MOM6@f02deae Replaced '.eq.' with '==' and '.ne.' with '/='
- NOAA-GFDL/MOM6@562acf0 Replaced '.ge.' with '>='
- NOAA-GFDL/MOM6@76a6778 Replaced 'if(' with 'if ('
- NOAA-GFDL/MOM6@5f4e030 Adding capability to bypass initializing a generic tracers
- NOAA-GFDL/MOM6@dbfe909 Merge branch 'dev/gfdl' into split_coupled_stepping
- NOAA-GFDL/MOM6@c36fa49 Shortened excesively long lines
- NOAA-GFDL/MOM6@ceb6100 Added dOxyGen comments in MOM_shared_initialization.F90
- NOAA-GFDL/MOM6@30cd987 Added dOxyGen comments in MOM_regridding.F90
- NOAA-GFDL/MOM6@ce06a5d Standardized argument attribute order
- NOAA-GFDL/MOM6@6cbfe0a Partially dOxyGenized MOM_ice_shelf.F90
- NOAA-GFDL/MOM6@a4fe3ae dOxyGenized arguments in MOM_opacity.F90
- NOAA-GFDL/MOM6@86818dd dOxyGenized arguments in MOM_energetic_PBL.F90
- NOAA-GFDL/MOM6@825e9bb Specified argument intent in MOM_tracer_hor_diff.F90
- NOAA-GFDL/MOM6@180832f Partially dOxyGenized MOM_horizontal_regridding.F90
- NOAA-GFDL/MOM6@db4aa4c dOxyGenized MOM_error_handler.F90
- NOAA-GFDL/MOM6@e92d76c dOxyGenized MOM_document.F90
- NOAA-GFDL/MOM6@86c0227 Specified argument intent in MOM_string_functions.F90
- NOAA-GFDL/MOM6@e28065b Specified argument intent in MOM_checksums.F90
- NOAA-GFDL/MOM6@327df24 +Created iceberg_forces and iceberg_fluxes
- NOAA-GFDL/MOM6@7b17fe7 +Moved iceberg parameters to marine_ice_CS
- NOAA-GFDL/MOM6@688aaef Declared intents for arguments in MOM_checksums
- NOAA-GFDL/MOM6@6f7f67b dOxyGenized the vertical_grid_type
- NOAA-GFDL/MOM6@187a40a Added dOxyGen comments for alloc_BT_cont_type
- NOAA-GFDL/MOM6@afb4318 Added dOxyGen comments in MOM_open_boundary
- NOAA-GFDL/MOM6@d3ea8c9 Added dOxyGen comments for calc_isoneutral_slopes
- NOAA-GFDL/MOM6@705471f Added dOxyGen comments for set_first_direction
- NOAA-GFDL/MOM6@75b205c Cleaned up argument descriptions in MOM_continuity
- NOAA-GFDL/MOM6@073b223 Added dOxyGen comments in MOM_checksum_packages
- NOAA-GFDL/MOM6@213ce03 dOxyGenized comments describing barotropic_CS
- NOAA-GFDL/MOM6@04bd7b6 Nullify local pointer variables & pointer elements
- NOAA-GFDL/MOM6@a1c5679 +Create module MOM_marine_ice
- NOAA-GFDL/MOM6@ef4cd0b +Added ice_rigidity pointer in ice_ocean_bdry_type
- NOAA-GFDL/MOM6@e7ffe07 Store iceberg properties in forces
- NOAA-GFDL/MOM6@6570af3 Consolidated duplicate code setting rigidity_ice.
- NOAA-GFDL/MOM6@0faaf96 Corrected index capitialization
- NOAA-GFDL/MOM6@4cc6eab (+)Added iceberg elements to mech_forcing type
- NOAA-GFDL/MOM6@0c5fab3 (+)Added Ocn_fluxes_used arg to update_ocean_model
- NOAA-GFDL/MOM6@4eef757 (*)Corrected bugs setting rigidity from iceshelves
- NOAA-GFDL/MOM6@3760246 Remove fluxes arg from finish_MOM_initialization
- NOAA-GFDL/MOM6@d436e59 Merge branch 'dev/gfdl' into split_coupled_stepping
- NOAA-GFDL/MOM6@438de7c Set fluxes%p_surf directly from IOB
- NOAA-GFDL/MOM6@8c66d1f +Add opt arg skip_pres to copy_common_forcing_fields
- NOAA-GFDL/MOM6@dd27db8 Restricted halo updates in MOM_surface_forcing
- NOAA-GFDL/MOM6@dbc5fa6 +Created convert_IOB_to_forces
- NOAA-GFDL/MOM6@e20bc91 +Added initialized element to mech_forcing type
- NOAA-GFDL/MOM6@078d7a3 (*?)Moved Update_Stokes_Drift to top of step_MOM
- NOAA-GFDL/MOM6@ea1e4fe (*)Corrected array syntax in explicit loops
- NOAA-GFDL/MOM6@9781d53 Doxygenized comments in MOM_barotropic.F90
- NOAA-GFDL/MOM6@b0745c8 Doxygenized comments in MOM_PressureForce.F90
  • Loading branch information
adcroft committed May 15, 2018
1 parent bed9677 commit 72580e8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 167 files

0 comments on commit 72580e8

Please sign in to comment.