Skip to content

Commit

Permalink
MOM6: Merge branch 'main-candidate-EMC-2021-01-04' into main
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@fe5e60589 Merge branch 'jiandewang-main-candidate-EMC-2021-01-04' into main
- NOAA-GFDL/MOM6@ea5e2458f Fixed white space and line length
- NOAA-GFDL/MOM6@c05b042d9 Added API documentation for chkerr()
- NOAA-GFDL/MOM6@172025dd8 add documentation for function ChkErr
- NOAA-GFDL/MOM6@633dc9241 add documentation for mom_cap_methods remove duplicated declearation of function chkerr, change case to match
- NOAA-GFDL/MOM6@5f5871c1d Addressing reviewers comments: * document wave coupling  variables * switch ii jj loops for computational efficiency * clarify error message * fix indexing and style
- NOAA-GFDL/MOM6@971802a7d revert back to GFDL main for coupled_driver codes
- NOAA-GFDL/MOM6@d50251632 minor enhancement in MOM_wave_interface.F90 to aviod undocumented error
- NOAA-GFDL/MOM6@593aecb3b Merge pull request NOAA-GFDL#45 from jiandewang/feature/update-to-GFDL-20201215
- NOAA-GFDL/MOM6@5d0f8b481 Merge commit '0f664aa82f3034252c334dad1e4129f2fee112e3' into feature/update-to-GFDL-20201215 this is corresponding to GFDL main branch commit 20201218 (hash # 0f664aa)
- NOAA-GFDL/MOM6@18bf38869 Merge pull request NOAA-GFDL#43 from NOAA-EMC/bugfix/mom6solo-ufs
- NOAA-GFDL/MOM6@2c150d951 bugfix: make the last argument in subroutine Update_Surface_Waves to be optional in src/user/MOM_wave_interface.F90.  This is a bug from PR NOAA-GFDL#23 bbdef39.
- NOAA-GFDL/MOM6@966d60800 Merge pull request NOAA-GFDL#40 from jiandewang/feature/update-to-GFDL-20201022
- NOAA-GFDL/MOM6@aff9c2c60 Merge commit 'ced41b5183920e0993f135feda0496a07a65981a' into feature/update-to-GFDL-20201022 this is corresponding to GFDL main 20201022 commit main-candidate-2020-09-18
- NOAA-GFDL/MOM6@7a76a1390 Merge pull request NOAA-GFDL#37 from aerorahul/bugfix/fieldwidth
- NOAA-GFDL/MOM6@d13efbe1c fix fieldwidth error with gfortran
- NOAA-GFDL/MOM6@3ce81f4c2 Merge pull request NOAA-GFDL#35 from jiandewang/feature/update-to-GFDL-20200811
- NOAA-GFDL/MOM6@fbfa05b91 Merge commit 'eb57e51f5ed2287e593c6de3a1e986735335ca55' into feature/update-to-GFDL-20200811
- NOAA-GFDL/MOM6@eb58a2e23 add ocean lag option, make cap consistent  (NOAA-GFDL#33)
- NOAA-GFDL/MOM6@7e1188c72 add statediagnose feature (NOAA-GFDL#31)
- NOAA-GFDL/MOM6@728c429c3 Merge pull request NOAA-GFDL#29 from jiandewang/feature/update-to-GFDL-20200515-2bug-fix
- NOAA-GFDL/MOM6@cbcf3ec9b bug fixing: (1) add missing halo in MOM_full_convection.F90 (2) remove wrong logic "not" in MOM.F90 at line 2669
- NOAA-GFDL/MOM6@4fccd95e9 merge GFDL dev/master May 29, 2020 commit (hash # 48d208d), which refer to dev-master-candidate-2020-05-15 solve conflict in: (1) config_src/coupled_driver/MOM_surface_forcing_gfdl.F90 (2) src/core/MOM_forcing_type.F90
- NOAA-GFDL/MOM6@bbdef39ae Updates for wave coupling in NUOPC  (NOAA-GFDL#23)
- NOAA-GFDL/MOM6@8d565ccdd nuopc_driver updates (NOAA-GFDL#22)
- NOAA-GFDL/MOM6@f8bc91c14 Feature/logcleanup (NOAA-GFDL#20)
- NOAA-GFDL/MOM6@6d2a83468 Merge pull request NOAA-GFDL#18 from jiandewang/update-to-GFDL-20200327
- NOAA-GFDL/MOM6@6aec544ea merge GFDL dev/master 20200401 commit (hash # 010492e) solve conflice in mom_surface_forcing_nuopc.F90
- NOAA-GFDL/MOM6@161cbb907 Merge pull request NOAA-GFDL#14 from jiandewang/update-to-GFDL-20200108
- NOAA-GFDL/MOM6@ca73ebb14 Merge remote-tracking branch 'Denise/feature/debugMOM6' into update-to-GFDL-20200108
- NOAA-GFDL/MOM6@8c23ae9ad fix divide by zero in wave_interface which allows for running in debug mode for NEMS (NOAA-GFDL#12)
- NOAA-GFDL/MOM6@d86631527 solve conflict in mom_surface_forcing_nuopc.F90
- NOAA-GFDL/MOM6@40871c180 more better way of fixing divide by zero
- NOAA-GFDL/MOM6@ae51d44ec fix to wave_interface for debugging; looked safe but gave error about mixed complex and real variables
- NOAA-GFDL/MOM6@7951a8436 fix divide by zero
  • Loading branch information
adcroft committed Jan 20, 2021
1 parent 3282e82 commit 69a096b
Showing 1 changed file with 1 addition and 1 deletion.

0 comments on commit 69a096b

Please sign in to comment.