sync with NCAR fork#3
Merged
Merged
Conversation
Split lines exceeding 120 characters in 55 source files to promote readability and compliance with MOM6 code standards. All answers are bitwise identical.
Added in more OBC options
- For some generic tracers we need to bypass initialization in MOM6 and leave it to the tracer package to initialize them. E.g., suppose MOM6 restart_flag='n', and we want to initialize some tracers to zero without providing a source file full of zeros for them. The user can then add the following switches to the field_tablefor cobalt to bypass initialize/restart them by MOM6, e.g., "namelists","ocean_mod","generic_cobalt" irr_mem_requires_src_info = f irr_mem_requires_restart = f /
Replaced 'if(' with 'if (' and 'elseif(' with 'elseif (' throughout the MOM6
code base to follow MOM6 coding conventions. All answers are bitwise identical.
Replace the older Fortran syntax '.ge.', '.gt.', '.lt.', and '.le.' with the clearer and more succinct syntax '>=', '>', '<', and '<='. All answers are bitwise identical.
Replace the older Fortran syntax '.eq.', and '.ne.' with the clearer and more succinct syntax '==' and '/='. All answers are bitwise identical.
Code standardization
…https://github.com/nikizadehgfdl/MOM6 into nikizadehgfdl-user/nikizadehgfdl/force_not_to_initialize_a_gtracer
…e_a_gtracer' into dev/gfdl
Added dOxyGen comments for all of the subroutines and their arguments in the PXM_functions and regrid_... modules in src/ALE. Also shortened the name of several variables. All answers are bitwise identical.
Combined i- and j- loops with the same interior code on the same line. All answers are bitwise identical.
Renamed several ..._coeffients variables as ..._coef, for brevity of expressions. All answers are bitwise identical.
Added dOxyGen comments for all of the subroutines and their arguments in the coord_... modules in ALE. Also shortened the name of several variables. All answers are bitwise identical.
Changed 'call sub (...)' to 'call sub(...)' in several places. All answers are bitwise identical, and only white-space is changed.
Changed 'array (...)' to 'array(...)' and 'call sub (...)' to 'call sub(...)' in numerous places in MOM_ice_shelf.F90. All answers are bitwise identical, and only white-space is changed.
Semicolons are not proper punctuation to end a sentence; instead they connect independent clauses. MOM6 is written in Fortran, not C; therefore trailing semicolons are unnecssary and have been removed. All answers are bitwise identical.
Added dOxyGen comments for all routines and arguments in MOM_debugging.F90. All answers are bitwise identical.
Added dOxyGen comments for all routines and arguments in MOM_checksums.F90. All answers are bitwise identical.
Added dOxyGen comments for all routines and arguments in MOM_safe_alloc.F90. All answers are bitwise identical.
Added dOxyGen comments for all routines and arguments in MOM_file_parser.F90. All answers are bitwise identical.
MOM6 code cleanup
Replaced 'end do' with 'enddo' and 'else if' with 'elseif', to follow typical practice in MOM6. Also adding spacing around the semicolons separating stacked enddo statements in several places. All answers are bitwise identical.
Added dOxyGen comments for all routines and arguments in MOM_coms.F90. All answers are bitwise identical.
Added dOxyGen comments for all routines and arguments in MOM_spatial_means.F90. All answers are bitwise identical.
- A pipeline will now be flagged with a warning if the MOM_parameter_doc files are modified by the PR.
Fixed some of the new dOxygen comments in MOM_debugging.F90 to document only one variable per comment and avoid excessively long lines. All answers are bitwise identical.
Sets lnoDGat1=.true. when gradient should not be matched
minor fixes and stylistic changes to dev/nuopc
updates to mct_driver and nuopc_driver
alperaltuntas
pushed a commit
that referenced
this pull request
Oct 25, 2018
Latest MOM6 dev/gfdl updates
gustavo-marques
pushed a commit
that referenced
this pull request
Apr 24, 2019
Merge dev/gfdl from NOAA-GFDL repository
alperaltuntas
pushed a commit
that referenced
this pull request
Sep 2, 2021
MOM_domain_infra: Document FMS passthroughs
alperaltuntas
pushed a commit
that referenced
this pull request
Nov 10, 2022
* reads in porous topography parameters from CHANNEL_LIST_FILE *new module to compute curve fit for porous topography *porous constraints used to modify continuity_PPM, CoriolisAdv, and Rayleigh bottom channel drag
alperaltuntas
pushed a commit
that referenced
this pull request
Nov 10, 2022
(+) porous topography implementation
alperaltuntas
pushed a commit
that referenced
this pull request
Nov 10, 2022
Use the por_face_area[UV] in the effective thickness calculations in zonal_face_thickness and merid_face_thickness, so that they are more consistent with their use elsewhere in the code for the relative weights in calculating the barotropic accelerations. Because these por_face_area arrays are still 1 in all test cases, the answers are unchanged in any test cases from before a few weeks ago, but there could be answer changes in cases that are using the very recently added capability (in PR #3) to set fractional face areas. This change was discussed with Sam Ditkovsky, and agreed that there is no reason to keep the ability to recover the previous answers in any cases that use the recently added partial face width option. This commit also expanded the comments describing the h_u and h_v arguments to btcalc(), zonal_face_thickness(), and merid_face_thickness() routines, the diag_h[uv] elements of the accel_diag_ptrs type and the h_u and h_v elements of the BT_cont_type. All answers and output are bitwise identical in the MOM6-examples test suite and TC tests, but answer changes are possible in cases using a very recently added code option.
alperaltuntas
pushed a commit
that referenced
this pull request
Jun 13, 2025
* Commit for coupling of land to ocean adot * Remove unused ice sheet enabled flag * add adot to Shelf restart * Register sfc mass flux outside of initialize fluxes * Gfdl cryo merge (#3) * Removed second registration of sfc_mass_flux with register_diag_field. * Registered sfc_mass_flux to runs with static and dynamic ice sheets. * This commit removed the second registration of 'sfc_mass_flux' in 'register_diag_field()' * Testing shelf_sfc_mass_flux restart. * The earlier removed 'register_diag_field()' for 'mass_flux' has been added back and 'register_restart_field()' of 'fluxes_in%shelf_sfc_mass_flux' is moved before 'restore_state()' * Corrected the line length error. * Added back 'CS%id_mass_flux = register_diag_field()' --------- Co-authored-by: NJSchlegel <nschlegel@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.