Additional global average flux diagnostics #43
Merged
Conversation
This file contains 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
Original scalar flux diagnostics were implemented as integrals. Global average versions added for convenience. Diags will be especially useful in monitoring coupled runs. Modified diag_tables: ice_ocean_SIS2/OM4_025/diag_table.MOM6 ocean_only/global_ALE/common/diag_table
Hallberg-NOAA
added a commit
that referenced
this pull request
Apr 24, 2018
Merged an extensive set of changes from dev/ncar onto dev/master. The list of commits include: - NOAA-GFDL/MOM6@77a97ba Merge branch 'NCAR-dev/ncar' into dev/master - NOAA-GFDL/MOM6@8050958 Merge pull request #55 from gustavo-marques/deallocate_diabatic - NOAA-GFDL/MOM6@648f31b Replace cvmix with CVMix - NOAA-GFDL/MOM6@4b21263 Merge pull request #54 from gustavo-marques/deallocate_diabatic - NOAA-GFDL/MOM6@165a5eb Comment call diabatic_driver_end - NOAA-GFDL/MOM6@9f4ce3a Un-comment call diabatic_driver_end - NOAA-GFDL/MOM6@4671c07 Comment call diabatic_driver_end to check if Travis still fails - NOAA-GFDL/MOM6@e90fbe9 Return if CS is not associated - NOAA-GFDL/MOM6@65527d6 Set useKPP = .false. (default) and comment call to diag_grid_storage_end - NOAA-GFDL/MOM6@2800524 Uncomment calls to deallocate KPP related arrays - NOAA-GFDL/MOM6@dab30b6 Merge pull request #52 from alperaltuntas/initialize_tidal_ctrl_vars - NOAA-GFDL/MOM6@334f124 Merge remote-tracking branch 'gmarques/fix_travis_deallocation' into initialize_tidal_ctrl_vars - NOAA-GFDL/MOM6@5153869 initialize boolean control vars in tidal mixing mod - NOAA-GFDL/MOM6@43b7968 Commenting out call to diabatic_driver_end in MOM.F90 - NOAA-GFDL/MOM6@dde5a59 Commenting out deallocation of KPP related arrays - NOAA-GFDL/MOM6@dc82c48 Return call if CS is not allocated - NOAA-GFDL/MOM6@dabe31b Update CVMix - NOAA-GFDL/MOM6@5640daf Attempt to fix deallocating unallocated arrays - NOAA-GFDL/MOM6@93eee52 Merge pull request #49 from gustavo-marques/update_cvmix - NOAA-GFDL/MOM6@d07120c Remove trailing space - NOAA-GFDL/MOM6@69bf4fa Updates CVMix - NOAA-GFDL/MOM6@5f19507 Merge pull request #48 from gustavo-marques/fix_cvmix_convection - NOAA-GFDL/MOM6@caf1d1e Fixes bug and renames variables - NOAA-GFDL/MOM6@869d32f Merge pull request #47 from alperaltuntas/introduce_cvmix_tidal - NOAA-GFDL/MOM6@01578c5 fix tidal_mixing_init return - NOAA-GFDL/MOM6@86e7074 Merge pull request #46 from alperaltuntas/introduce_cvmix_tidal - NOAA-GFDL/MOM6@bf322c8 add tidal mixing-specific prandtl number - NOAA-GFDL/MOM6@81a5ef8 Merged with latest master - NOAA-GFDL/MOM6@696462c MOM_tidal_mixing. cleaanup - NOAA-GFDL/MOM6@3e7cab8 debug calculate_cvmix_tidal - NOAA-GFDL/MOM6@78bb40c Merge pull request #44 from NCAR/adding_cvmix - NOAA-GFDL/MOM6@4dde603 Avoided a possible seg. fault in set_diffusivity_end - NOAA-GFDL/MOM6@36f7a06 Changed kv to a pointer since it might not always be associated - NOAA-GFDL/MOM6@0ce9980 By pass reading BULKMIXEDLAYER via get_param - NOAA-GFDL/MOM6@1218973 Raname variables Kd -> kd_lay; visc%Kv_slow - > kv - NOAA-GFDL/MOM6@ea813b8 add tidal diagnostics for cvmix - NOAA-GFDL/MOM6@648018e Rename kv_conv -> kv_conv_const; kd_conv -> kd_conv_const - NOAA-GFDL/MOM6@c1acec8 Add vertical background viscosity into visc%Kv_slow - NOAA-GFDL/MOM6@a2498a1 Changed name in register_diag_field kd_shear -> kd_shear_cvmix; kv_shear -> kv_shear_cvmix - NOAA-GFDL/MOM6@37ca38f Renamed kd_bkgnd_3d -> kd_bkgnd; kv_bkgnd_3d -> kv_bkgnd - NOAA-GFDL/MOM6@105094f Add viscosities due to convection into visc%Kv_slow - NOAA-GFDL/MOM6@e544290 Allocated/deallocate visc%Kv_slow - NOAA-GFDL/MOM6@801a86a Added variable Kv_slow in visc type - NOAA-GFDL/MOM6@8977888 Move tidal diagnostics to MOM_tidal_mixing module - NOAA-GFDL/MOM6@2430f6e correct tidal energy file dir - NOAA-GFDL/MOM6@a3155d6 Add tidal parameter consistency checks. - NOAA-GFDL/MOM6@80c33a4 Replaced Kv_turb -> Kv_shear - NOAA-GFDL/MOM6@644f200 Replaced Kv_turb -> Kv_shear - NOAA-GFDL/MOM6@6a2e864 Replaced Kd_turb -> Kd_shear and Kv_turb -> Kv_shear - NOAA-GFDL/MOM6@7376f49 update Kd - NOAA-GFDL/MOM6@69ab998 Added a unique Prandtl # for convection and background - NOAA-GFDL/MOM6@4cac1e1 Renamed variables (KH to kd; KM to kv) and added diagnostics - NOAA-GFDL/MOM6@e992292 Added calculate_cvmix_tidal interface - NOAA-GFDL/MOM6@2c451c8 Merge pull request #43 from alperaltuntas/dev/ncar - NOAA-GFDL/MOM6@d1cee89 Add timestep initializations to calculate_cvmix_tidal - NOAA-GFDL/MOM6@7a81871 Re-structured MOM_bkgnd_mixing - NOAA-GFDL/MOM6@3fcdb4c Update to new CVMix tag with tidal mixing changes - NOAA-GFDL/MOM6@f361002 Read in tidal energy dissipation - NOAA-GFDL/MOM6@4e8dd5a Added a if statement to check if Int_tide_dissipation and Bryan_Lewis are used at the same time. - NOAA-GFDL/MOM6@8ef5a1b Renamed Bryan&Lewis coeffs and added a 3D array for depth - NOAA-GFDL/MOM6@08db85c Deleted code that has been moved to MOM_bkgnd_mixing.F90 - NOAA-GFDL/MOM6@1be0248 Added first version of MOM_bkgnd_mixing - NOAA-GFDL/MOM6@1116f49 Fixed a problem in cvmix_init_bkgnd_BryanLewis_low - NOAA-GFDL/MOM6@83089ff Updated CVMix - NOAA-GFDL/MOM6@a101e49 Reduced the numbers of characters in a line - NOAA-GFDL/MOM6@53004ec Deleted module MOM_diffConvection - NOAA-GFDL/MOM6@0bb899a uncomment cvmix_init_tidal - NOAA-GFDL/MOM6@22902de Mv add_int_tide_diffusivity to tidal_mixing module - NOAA-GFDL/MOM6@c34ab63 Move diags back from MOM_tidal_mixing to MOM_set_diffusivity (for now) - NOAA-GFDL/MOM6@76546aa Move tidal mixing initialization to MOM_tidal_mixing - NOAA-GFDL/MOM6@95406ff Rename MOM_cvmix_tidal module as MOM_tidal_mixing (for now) - NOAA-GFDL/MOM6@c2dea88 update diabatic driver for MOM_cvmix_tidal module - NOAA-GFDL/MOM6@bb7917a comment out call ocn_domain_mct to avoid uninitialized vars for now. more comprehensive cleanup is to come. - NOAA-GFDL/MOM6@941bfb6 Updated mixing coeff. due to convection - NOAA-GFDL/MOM6@ba2a0a4 Added function cvmix_conv_is_used and register restart fields. - NOAA-GFDL/MOM6@c78ac9a Add the new module MOM_cvmix_tidal - NOAA-GFDL/MOM6@1d850a6 Changed hbl to an optional pointer; do not apply mixing due to convection within the boundary layer - NOAA-GFDL/MOM6@afd8f59 Fixed a bug in the deallocate call - NOAA-GFDL/MOM6@a77d114 Fixed a bug in the deallocate call - NOAA-GFDL/MOM6@f12702c Dealocate memory via cvmix_shear_end and changed some var names to snake_case convention - NOAA-GFDL/MOM6@a209b7a Added a call to diabatic_driver_end - NOAA-GFDL/MOM6@e84f706 Fix array allocattion/dealocation - NOAA-GFDL/MOM6@7f6d8f1 Added call to KPP_get_BLD - NOAA-GFDL/MOM6@fc00e77 Added function to copy KPP surface boundary layer depth into BLD - NOAA-GFDL/MOM6@c99e94b Updates visc%Kd_turb and visc%Kv_turb after convection is applied - NOAA-GFDL/MOM6@97152b1 Adding first version of convection calls via CVMix - NOAA-GFDL/MOM6@dca5736 Add comments for adding additonal CVMix components and clean module - NOAA-GFDL/MOM6@c6327d6 Copy OBLdepth from KPP into visc%MLD and Hml - NOAA-GFDL/MOM6@71ff26b Changed multi-word names from camelCase to snake_case - NOAA-GFDL/MOM6@8095e8f Merge pull request #42 from gustavo-marques/merge-dev-master-2018-02-28 - NOAA-GFDL/MOM6@bd80a20 Merge branch 'dev/master' into merge-dev-master-2018-02-28 - NOAA-GFDL/MOM6@2f79ffc Merge pull request #41 from gustavo-marques/merge_dev_master_20feb2018
Hallberg-NOAA
added a commit
that referenced
this pull request
Apr 25, 2018
Merged an extensive set of changes from dev/ncar onto dev/master, and then from dev/master into dev/gfdl. The list of commits include: - NOAA-GFDL/MOM6@3c70582 Merge branch 'dev/master' into dev/gfdl - NOAA-GFDL/MOM6@77a97ba Merge branch 'NCAR-dev/ncar' into dev/master - NOAA-GFDL/MOM6@8050958 Merge pull request #55 from gustavo-marques/deallocate_diabatic - NOAA-GFDL/MOM6@648f31b Replace cvmix with CVMix - NOAA-GFDL/MOM6@4b21263 Merge pull request #54 from gustavo-marques/deallocate_diabatic - NOAA-GFDL/MOM6@165a5eb Comment call diabatic_driver_end - NOAA-GFDL/MOM6@9f4ce3a Un-comment call diabatic_driver_end - NOAA-GFDL/MOM6@4671c07 Comment call diabatic_driver_end to check if Travis still fails - NOAA-GFDL/MOM6@e90fbe9 Return if CS is not associated - NOAA-GFDL/MOM6@65527d6 Set useKPP = .false. (default) and comment call to diag_grid_storage_end - NOAA-GFDL/MOM6@2800524 Uncomment calls to deallocate KPP related arrays - NOAA-GFDL/MOM6@dab30b6 Merge pull request #52 from alperaltuntas/initialize_tidal_ctrl_vars - NOAA-GFDL/MOM6@334f124 Merge remote-tracking branch 'gmarques/fix_travis_deallocation' into initialize_tidal_ctrl_vars - NOAA-GFDL/MOM6@5153869 initialize boolean control vars in tidal mixing mod - NOAA-GFDL/MOM6@43b7968 Commenting out call to diabatic_driver_end in MOM.F90 - NOAA-GFDL/MOM6@dde5a59 Commenting out deallocation of KPP related arrays - NOAA-GFDL/MOM6@dc82c48 Return call if CS is not allocated - NOAA-GFDL/MOM6@dabe31b Update CVMix - NOAA-GFDL/MOM6@5640daf Attempt to fix deallocating unallocated arrays - NOAA-GFDL/MOM6@93eee52 Merge pull request #49 from gustavo-marques/update_cvmix - NOAA-GFDL/MOM6@d07120c Remove trailing space - NOAA-GFDL/MOM6@69bf4fa Updates CVMix - NOAA-GFDL/MOM6@5f19507 Merge pull request #48 from gustavo-marques/fix_cvmix_convection - NOAA-GFDL/MOM6@caf1d1e Fixes bug and renames variables - NOAA-GFDL/MOM6@869d32f Merge pull request #47 from alperaltuntas/introduce_cvmix_tidal - NOAA-GFDL/MOM6@01578c5 fix tidal_mixing_init return - NOAA-GFDL/MOM6@86e7074 Merge pull request #46 from alperaltuntas/introduce_cvmix_tidal - NOAA-GFDL/MOM6@bf322c8 add tidal mixing-specific prandtl number - NOAA-GFDL/MOM6@81a5ef8 Merged with latest master - NOAA-GFDL/MOM6@696462c MOM_tidal_mixing. cleaanup - NOAA-GFDL/MOM6@3e7cab8 debug calculate_cvmix_tidal - NOAA-GFDL/MOM6@78bb40c Merge pull request #44 from NCAR/adding_cvmix - NOAA-GFDL/MOM6@4dde603 Avoided a possible seg. fault in set_diffusivity_end - NOAA-GFDL/MOM6@36f7a06 Changed kv to a pointer since it might not always be associated - NOAA-GFDL/MOM6@0ce9980 By pass reading BULKMIXEDLAYER via get_param - NOAA-GFDL/MOM6@1218973 Raname variables Kd -> kd_lay; visc%Kv_slow - > kv - NOAA-GFDL/MOM6@ea813b8 add tidal diagnostics for cvmix - NOAA-GFDL/MOM6@648018e Rename kv_conv -> kv_conv_const; kd_conv -> kd_conv_const - NOAA-GFDL/MOM6@c1acec8 Add vertical background viscosity into visc%Kv_slow - NOAA-GFDL/MOM6@a2498a1 Changed name in register_diag_field kd_shear -> kd_shear_cvmix; kv_shear -> kv_shear_cvmix - NOAA-GFDL/MOM6@37ca38f Renamed kd_bkgnd_3d -> kd_bkgnd; kv_bkgnd_3d -> kv_bkgnd - NOAA-GFDL/MOM6@105094f Add viscosities due to convection into visc%Kv_slow - NOAA-GFDL/MOM6@e544290 Allocated/deallocate visc%Kv_slow - NOAA-GFDL/MOM6@801a86a Added variable Kv_slow in visc type - NOAA-GFDL/MOM6@8977888 Move tidal diagnostics to MOM_tidal_mixing module - NOAA-GFDL/MOM6@2430f6e correct tidal energy file dir - NOAA-GFDL/MOM6@a3155d6 Add tidal parameter consistency checks. - NOAA-GFDL/MOM6@80c33a4 Replaced Kv_turb -> Kv_shear - NOAA-GFDL/MOM6@644f200 Replaced Kv_turb -> Kv_shear - NOAA-GFDL/MOM6@6a2e864 Replaced Kd_turb -> Kd_shear and Kv_turb -> Kv_shear - NOAA-GFDL/MOM6@7376f49 update Kd - NOAA-GFDL/MOM6@69ab998 Added a unique Prandtl # for convection and background - NOAA-GFDL/MOM6@4cac1e1 Renamed variables (KH to kd; KM to kv) and added diagnostics - NOAA-GFDL/MOM6@e992292 Added calculate_cvmix_tidal interface - NOAA-GFDL/MOM6@2c451c8 Merge pull request #43 from alperaltuntas/dev/ncar - NOAA-GFDL/MOM6@d1cee89 Add timestep initializations to calculate_cvmix_tidal - NOAA-GFDL/MOM6@7a81871 Re-structured MOM_bkgnd_mixing - NOAA-GFDL/MOM6@3fcdb4c Update to new CVMix tag with tidal mixing changes - NOAA-GFDL/MOM6@f361002 Read in tidal energy dissipation - NOAA-GFDL/MOM6@4e8dd5a Added a if statement to check if Int_tide_dissipation and Bryan_Lewis are used at the same time. - NOAA-GFDL/MOM6@8ef5a1b Renamed Bryan&Lewis coeffs and added a 3D array for depth - NOAA-GFDL/MOM6@08db85c Deleted code that has been moved to MOM_bkgnd_mixing.F90 - NOAA-GFDL/MOM6@1be0248 Added first version of MOM_bkgnd_mixing - NOAA-GFDL/MOM6@1116f49 Fixed a problem in cvmix_init_bkgnd_BryanLewis_low - NOAA-GFDL/MOM6@83089ff Updated CVMix - NOAA-GFDL/MOM6@a101e49 Reduced the numbers of characters in a line - NOAA-GFDL/MOM6@53004ec Deleted module MOM_diffConvection - NOAA-GFDL/MOM6@0bb899a uncomment cvmix_init_tidal - NOAA-GFDL/MOM6@22902de Mv add_int_tide_diffusivity to tidal_mixing module - NOAA-GFDL/MOM6@c34ab63 Move diags back from MOM_tidal_mixing to MOM_set_diffusivity (for now) - NOAA-GFDL/MOM6@76546aa Move tidal mixing initialization to MOM_tidal_mixing - NOAA-GFDL/MOM6@95406ff Rename MOM_cvmix_tidal module as MOM_tidal_mixing (for now) - NOAA-GFDL/MOM6@c2dea88 update diabatic driver for MOM_cvmix_tidal module - NOAA-GFDL/MOM6@bb7917a comment out call ocn_domain_mct to avoid uninitialized vars for now. more comprehensive cleanup is to come. - NOAA-GFDL/MOM6@941bfb6 Updated mixing coeff. due to convection - NOAA-GFDL/MOM6@ba2a0a4 Added function cvmix_conv_is_used and register restart fields. - NOAA-GFDL/MOM6@c78ac9a Add the new module MOM_cvmix_tidal - NOAA-GFDL/MOM6@1d850a6 Changed hbl to an optional pointer; do not apply mixing due to convection within the boundary layer - NOAA-GFDL/MOM6@afd8f59 Fixed a bug in the deallocate call - NOAA-GFDL/MOM6@a77d114 Fixed a bug in the deallocate call - NOAA-GFDL/MOM6@f12702c Dealocate memory via cvmix_shear_end and changed some var names to snake_case convention - NOAA-GFDL/MOM6@a209b7a Added a call to diabatic_driver_end - NOAA-GFDL/MOM6@e84f706 Fix array allocattion/dealocation - NOAA-GFDL/MOM6@7f6d8f1 Added call to KPP_get_BLD - NOAA-GFDL/MOM6@fc00e77 Added function to copy KPP surface boundary layer depth into BLD - NOAA-GFDL/MOM6@c99e94b Updates visc%Kd_turb and visc%Kv_turb after convection is applied - NOAA-GFDL/MOM6@97152b1 Adding first version of convection calls via CVMix - NOAA-GFDL/MOM6@dca5736 Add comments for adding additonal CVMix components and clean module - NOAA-GFDL/MOM6@c6327d6 Copy OBLdepth from KPP into visc%MLD and Hml - NOAA-GFDL/MOM6@71ff26b Changed multi-word names from camelCase to snake_case - NOAA-GFDL/MOM6@8095e8f Merge pull request #42 from gustavo-marques/merge-dev-master-2018-02-28 - NOAA-GFDL/MOM6@bd80a20 Merge branch 'dev/master' into merge-dev-master-2018-02-28 - NOAA-GFDL/MOM6@2f79ffc Merge pull request #41 from gustavo-marques/merge_dev_master_20feb2018
adcroft
added a commit
to adcroft/MOM6-examples
that referenced
this pull request
Jan 20, 2021
- 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
adcroft
added a commit
to adcroft/MOM6-examples
that referenced
this pull request
Jan 20, 2021
- NOAA-GFDL/MOM6@55279ccc4 Merge branch 'main' into main-to-gfdl - 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@263d355a1 Merge pull request #1291 from MJHarrison-GFDL/oda_use_framework - NOAA-GFDL/MOM6@02c08f68a Merge pull request NOAA-GFDL#12 from Hallberg-NOAA/Harrison_ODA_use_framework - NOAA-GFDL/MOM6@4d839aa44 Merge branch 'oda_use_framework' of https://github.com/MJHarrison-GFDL/MOM6 into Harrison_ODA_use_framework - NOAA-GFDL/MOM6@b90ad5cc6 Merge pull request #1289 from Hallberg-NOAA/revise_framework_more - NOAA-GFDL/MOM6@fcae4b9f9 Merge branch 'dev/gfdl' into revise_framework_more - NOAA-GFDL/MOM6@da8e4cb8b Merge pull request #1292 from adcroft/nuopc-api-test - NOAA-GFDL/MOM6@49c7fddfe Merge branch 'dev/gfdl' into nuopc-api-test - NOAA-GFDL/MOM6@2157311ff Merge branch 'dev/gfdl' into revise_framework_more - NOAA-GFDL/MOM6@be5fb700a Merge pull request #1287 from marshallward/hor_visc_2x - NOAA-GFDL/MOM6@d4fe16e3c Merge branch 'dev/gfdl' into nuopc-api-test - NOAA-GFDL/MOM6@354d6d640 MOM_hor_visc: Revert tension/shear loop fusion - NOAA-GFDL/MOM6@eb0c03a3d Avoid unnecessary steps in actions/testing_setup - NOAA-GFDL/MOM6@e29a12b80 Adds a GH workflow to check driver APIs - NOAA-GFDL/MOM6@776a81510 Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into oda_use_framework - NOAA-GFDL/MOM6@408e3a402 Pass through interface to FMS ensemble manager - NOAA-GFDL/MOM6@18aff413a Replace FMS infrastructure specific calls with equivalent MOM interfaces - NOAA-GFDL/MOM6@bfdbe2115 New interfaces for array redistribution across domains. - NOAA-GFDL/MOM6@b6ce7c742 pass through interfaces for mpp_broadcast_domain and mpp_set_root_pe - NOAA-GFDL/MOM6@6b24190c6 update analysis time after call to oda , consistent with SPEAR configurations - NOAA-GFDL/MOM6@76b3ccce4 Use only for netcdf in MOM_horizontal_regridding - NOAA-GFDL/MOM6@e4d984a7a +Created MOM_diag_manager to wrap diag_manager - NOAA-GFDL/MOM6@7114d63c1 Merge branch 'dev/gfdl' into hor_visc_2x - NOAA-GFDL/MOM6@9dabf3f52 Merge branch 'dev/gfdl' into revise_framework_more - NOAA-GFDL/MOM6@76cb4718d Cleaned up MOM_horizontal_regridding - NOAA-GFDL/MOM6@0bd16f4ab Merge pull request #1283 from Hallberg-NOAA/revise_framework - NOAA-GFDL/MOM6@f7beef432 Merge branch 'dev/gfdl' into revise_framework - NOAA-GFDL/MOM6@91b6a15c7 Merge pull request #1288 from adcroft/stream-log-on-fail - NOAA-GFDL/MOM6@43ae9ae7d Adds --with-driver option to configure - NOAA-GFDL/MOM6@a0eb0b69b Always stream job logs in gitlab pipeline - NOAA-GFDL/MOM6@d610712fe Merge branch 'revise_framework' into revise_framework_more - NOAA-GFDL/MOM6@77d0cbe9c Corrected a bug using IO_LAYOUT in place of LAYOUT - NOAA-GFDL/MOM6@906bdc484 Merge branch 'revise_framework' into revise_framework_more - NOAA-GFDL/MOM6@a433cac41 Merge branch 'dev/gfdl' into revise_framework - NOAA-GFDL/MOM6@1417dceb4 +Added MOM_interpolate.F90 - NOAA-GFDL/MOM6@873e4bc3a Merge pull request #1282 from Hallberg-NOAA/indent_cleanup - NOAA-GFDL/MOM6@571013dad +Added MOM_coms_wrapper.F90 - NOAA-GFDL/MOM6@5c93def09 MOM_hor_visc: horizontal_viscosity loop reorder - NOAA-GFDL/MOM6@dc7476755 Adds targets check_mom6_api_nuopc, check_mom6_api_coupled - NOAA-GFDL/MOM6@e1ca9a905 Doxygen comments for get_layout_extents arguments - NOAA-GFDL/MOM6@45d29a99c +Added an explicit interface to open_file - NOAA-GFDL/MOM6@51720fb33 +Split MOM_io_wrapper.F90 out from MOM_io.F90 - NOAA-GFDL/MOM6@37ef28bc0 +Add get_domain_components to MOM_domains.F90 - NOAA-GFDL/MOM6@81a6ff8ee +Add explicit interface for field_exists to MOM_io - NOAA-GFDL/MOM6@d8806f48e +Rename rotated_mpp_chksum to rotated_field_chksum - NOAA-GFDL/MOM6@adb8ec46b +Add deallocate_MOM_domain and get_layout_extents - NOAA-GFDL/MOM6@502eb301e (*)Call MOM_write_field in write_ocean_geometry_file - NOAA-GFDL/MOM6@7091a09c1 +Add MOM_write_field - NOAA-GFDL/MOM6@ee7dd32c8 +Add create_MOM_domain and MOM_domain_init.F90 - NOAA-GFDL/MOM6@1480fbee4 Fix non-standard indentation - NOAA-GFDL/MOM6@e68d31a62 Merge pull request #1268 from Hallberg-NOAA/ke_from_GV - NOAA-GFDL/MOM6@633dc9241 add documentation for mom_cap_methods remove duplicated declearation of function chkerr, change case to match - NOAA-GFDL/MOM6@2fd4596c7 Corrected yet another OMP directive - 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@069760426 Corrected an OMP directive - NOAA-GFDL/MOM6@5c9b5fad7 Corrected the statement setting use_ice_shelf - NOAA-GFDL/MOM6@c14d208bb Merge commit 'a489a13b' into ke_from_GV - NOAA-GFDL/MOM6@7de89471d Merge branch 'dev/gfdl' into ke_from_GV - NOAA-GFDL/MOM6@d819ccf31 Merge pull request #1280 from Hallberg-NOAA/module_use_cleanup - NOAA-GFDL/MOM6@ca5493caa Merge branch 'dev/gfdl' into module_use_cleanup - NOAA-GFDL/MOM6@a489a13bd Merge branch 'dev/gfdl' into ke_from_GV - NOAA-GFDL/MOM6@971802a7d revert back to GFDL main for coupled_driver codes - NOAA-GFDL/MOM6@aea16f730 Use read_field_chksum in MOM_restart - NOAA-GFDL/MOM6@aed5a680b +Add the new routine read_field_chksum to MOM_io - NOAA-GFDL/MOM6@0b019b667 Avoid using memory macros in MOM_random.F90 - NOAA-GFDL/MOM6@611132731 Use MOM_read_data in RGC_initialization - NOAA-GFDL/MOM6@9b0b8db88 Use MOM framework routines in MOM_open_boundary - NOAA-GFDL/MOM6@1e6bdd6a1 Remove unused module use statements - NOAA-GFDL/MOM6@fc6d60835 Merge branch 'dev/gfdl' into ke_from_GV - NOAA-GFDL/MOM6@d50251632 minor enhancement in MOM_wave_interface.F90 to aviod undocumented error - NOAA-GFDL/MOM6@204622f39 Merge branch 'dev/gfdl' into ke_from_GV - 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@6d5999639 Corrected an OMP directive - NOAA-GFDL/MOM6@6096c6c2e Corrected spacing around semicolons between dos - NOAA-GFDL/MOM6@3f7d3cf1e Corrected additional non-standard line indents - NOAA-GFDL/MOM6@126743133 Merge branch 'dev/gfdl' into ke_from_GV - NOAA-GFDL/MOM6@4075e747d Corrected non-standard line indents - NOAA-GFDL/MOM6@9b333433f +Replace SZK_(G) with SZK_(GV) - NOAA-GFDL/MOM6@8d9cecd6a Merge remote-tracking branch 'hallberg/simplify_diabatic' into ke_from_GV - NOAA-GFDL/MOM6@4ab93b69d +Deprecate the use of G%ke, using GV%ke instead - 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
marshallward
added a commit
that referenced
this pull request
Apr 14, 2021
- NOAA-GFDL/MOM6@fc75e0fa4 Merge pull request #1370 from Hallberg-NOAA/F_case_file_output - NOAA-GFDL/MOM6@e8e8abab9 Merge remote-tracking branch 'hallberg/F_case_file_output' into F_case_file_output - NOAA-GFDL/MOM6@96f1d1e89 Use allocatable types in write_ocean_geometry_files - NOAA-GFDL/MOM6@983824a69 Merge branch 'dev/gfdl' into F_case_file_output - NOAA-GFDL/MOM6@5fe51b18e Merge pull request #1369 from Hallberg-NOAA/SIS2_IO_upgrades - NOAA-GFDL/MOM6@0eb47b25a +More consistent treatment of input_filename = 'F' - NOAA-GFDL/MOM6@03b997b88 +Enhanced support for novel axes in MOM_io - NOAA-GFDL/MOM6@7ec08cd9b Merge pull request #1365 from marshallward/corad_vec_v2 - NOAA-GFDL/MOM6@dc66dd8a7 Merge branch 'dev/gfdl' into corad_vec_v2 - NOAA-GFDL/MOM6@c5c74419d Merge pull request #1364 from jkrasting/downsampled_diag_fix - NOAA-GFDL/MOM6@a5fb36503 Merge branch 'dev/gfdl' into downsampled_diag_fix - NOAA-GFDL/MOM6@d485a5123 Merge pull request #1363 from Hallberg-NOAA/SIS2_infra_support - NOAA-GFDL/MOM6@b413f25c5 Merge branch 'SIS2_infra_support' of github.com:Hallberg-NOAA/MOM6 into SIS2_infra_support - NOAA-GFDL/MOM6@358da7cc4 Corrected comments describing CT_copy_data - NOAA-GFDL/MOM6@ad0bc3c41 Merge branch 'dev/gfdl' into SIS2_infra_support - NOAA-GFDL/MOM6@fae570d0a Merge branch 'main' into main_to_gfdl - NOAA-GFDL/MOM6@5f063044c Fixed downsampling summation for more diag types - NOAA-GFDL/MOM6@c549ae9d9 Merge pull request #1358 from NOAA-GFDL/dev-gfdl-main-candidate-2021-03-26 - NOAA-GFDL/MOM6@ad372fdc2 Merge branch 'dev/gfdl' into SIS2_infra_support - NOAA-GFDL/MOM6@d1dc6b5ba Coriolis: Improved coradcalc vectorization - NOAA-GFDL/MOM6@2b6d3e115 Merge pull request #1362 from marshallward/horvisc_diag_to_stack - NOAA-GFDL/MOM6@9792b2346 Fixed downsampling for x:sum y:point z:point diags - NOAA-GFDL/MOM6@665cd9a3b Merge branch 'dev/gfdl' into horvisc_diag_to_stack - NOAA-GFDL/MOM6@b6c7fdb02 change default value of use_mommesh as true - NOAA-GFDL/MOM6@6d4a48390 Merge pull request #1360 from Hallberg-NOAA/fewer_timelevels - NOAA-GFDL/MOM6@3c1cb2efd +Add MOM_domains interfaces needed by SIS2 - NOAA-GFDL/MOM6@cfa59aab1 +Add coupler_types interfaces needed by SIS2 - NOAA-GFDL/MOM6@97f111779 Merge branch 'dev/gfdl' into fewer_timelevels - NOAA-GFDL/MOM6@813fc7975 Merge pull request #1359 from Hallberg-NOAA/FMS2_io_writes - NOAA-GFDL/MOM6@2ffea27be MOM_hor_visc: Variables moved to stack - NOAA-GFDL/MOM6@4fd380747 Merge branch 'dev/gfdl' into FMS2_io_writes - NOAA-GFDL/MOM6@c62d51f9d Remove inappropriate timelevel arguments - NOAA-GFDL/MOM6@13f1e70f5 Merge pull request #1356 from GEOS-ESM/bugfix/sanAkel/output-b-grid-currents - NOAA-GFDL/MOM6@6c2b944e2 Merge branch 'dev/gfdl' into bugfix/sanAkel/output-b-grid-currents - NOAA-GFDL/MOM6@67b03e324 Merge pull request #1353 from Hallberg-NOAA/less_checksums - NOAA-GFDL/MOM6@5669d4360 Merge branch 'dev/gfdl' into less_checksums - NOAA-GFDL/MOM6@b044be8ee Merge branch 'dev/gfdl' into FMS2_io_writes - NOAA-GFDL/MOM6@fe9b2a106 Merge pull request #1352 from Hallberg-NOAA/FMS2_io - NOAA-GFDL/MOM6@f6105cb22 Merge branch 'dev/gfdl' into FMS2_io - NOAA-GFDL/MOM6@95ad9372b Fix distributed reads of checksums using FMS2_io - NOAA-GFDL/MOM6@81c48cbf6 Merge pull request #5 from marshallward/FMS2_io_writes - NOAA-GFDL/MOM6@ba643bde2 Explicit domain decomposition of horizontal axes - NOAA-GFDL/MOM6@7bdecbc62 Add missing ".nc" to FMS2 output filenames - NOAA-GFDL/MOM6@fad7e0d4a Merge branch 'dev/gfdl' into bugfix/sanAkel/output-b-grid-currents - NOAA-GFDL/MOM6@17afc2b5e A call to pass_vector(...) is needed to correctly do a halo exchange before getting currents in A- or B-grid staggering. Now added. - NOAA-GFDL/MOM6@3fe07d4c6 +Move FMS2 read helper routines into MOM_io_infra - NOAA-GFDL/MOM6@2579d0771 Merge pull request #4 from gustavo-marques/less_checksums_mct_nuopc - NOAA-GFDL/MOM6@66ac81057 Only write checksums from root PE MCT/NUOPC caps - NOAA-GFDL/MOM6@84d5e2176 +FMS2 reads for ints & MOM_read_data_fms2 cleanup - NOAA-GFDL/MOM6@4843c6c4d Merge branch 'dev/gfdl' into FMS2_io - NOAA-GFDL/MOM6@03e174e14 Removed FMS2 MOM_axis and MOM_write_field_fms2 - NOAA-GFDL/MOM6@255233ba3 Added code to write via FMS2 interfaces - NOAA-GFDL/MOM6@0fdc5c438 Correct warnings from categorize_axis - NOAA-GFDL/MOM6@f89ddeaa8 +Add edge_axis argument to write_metadata_axis - NOAA-GFDL/MOM6@ee0152f26 +Separate MOM_interp_infra axistype from MOM_io - NOAA-GFDL/MOM6@09173f7dc Only write checksums from root PE for FMS_cap - NOAA-GFDL/MOM6@30b057116 Merge branch 'dev/gfdl' into FMS2_io - NOAA-GFDL/MOM6@91232095d Merge branch 'dev/gfdl' into FMS2_io - NOAA-GFDL/MOM6@aab2ad645 +Add ability to read fields via FMS2 interfaces - NOAA-GFDL/MOM6@23a78d2f6 Clean up in MOM_restart.F90 - NOAA-GFDL/MOM6@c68fedfea +Change arguments to MOM_register_variable_axes - NOAA-GFDL/MOM6@0ba1aa53e +Simplified read_data_fms2 and write_field_fms2 - NOAA-GFDL/MOM6@f2459ec21 Merge branch 'user/jml/add_fms2io_to_MOM_restart' of https://github.com/wrongkindofdoctor/MOM6 into FMS2_io - NOAA-GFDL/MOM6@a07757314 Explicitly set (1x1) io_domain as a default - NOAA-GFDL/MOM6@d4531ca37 Duplicated infra/FMS1 into infra/FMS2 - NOAA-GFDL/MOM6@f806579bc Correct module use statements in infra/FMS1 - NOAA-GFDL/MOM6@2e46ea6d7 removed errant .true. in save_restart call - NOAA-GFDL/MOM6@809b3ac52 added local logical variables to save restart wrapper that are set using the use_fms2 and write_ic flags if present to avoid invalid memory reference error added str_len argument to register_variable_attribute calls - NOAA-GFDL/MOM6@a74c7eaba changed FMS release to 2020.03-beta1 - NOAA-GFDL/MOM6@5c2daa5da converted save_restart and restore_state to interface that call versions of the routines with the fms-io or fms2-io interfaces added module use statments for fms2_io and MOM_io helper routines to MOM_restart added use_fms2=.true. arguments to save_restart and restore_state calls added write_ic=.true. to the save_restart call in MOM.F90 - NOAA-GFDL/MOM6@40047fa50 Merge pull request #66 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@c8695c621 Merge pull request #65 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@0cf3cb9c9 Merge pull request #64 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@de7f95a57 Merge pull request #63 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@50c353935 Merge pull request #62 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@cbdcf8a52 Create hola_tierra.yml - NOAA-GFDL/MOM6@763b17650 Merge pull request #61 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@ff3412651 Merge pull request #60 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@cea55fec4 Merge pull request #59 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@b8eee455f Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl - NOAA-GFDL/MOM6@46b8f0fd5 Merge pull request #58 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@ff1a27f59 Merge pull request #57 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@496617cb1 Merge pull request #56 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@e9281f40e Merge pull request #55 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@4a5613400 Merge pull request #54 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@86c2a7dfa Merge pull request #53 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@c24535733 Merge pull request #52 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@8d7be6866 Merge pull request #51 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@7adcc9037 Merge pull request #50 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@aff2a13ab Merge pull request #49 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@477d9f85d Merge pull request #48 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@cee0a2166 Merge pull request #47 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@12dccaf8a Merge pull request #46 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@7dbca83ff Merge pull request #44 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@162ca970b Merge pull request #43 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@abaf004cb Merge pull request #42 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@075ab81e5 Merge pull request #41 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@e072bc7cc Merge in latest dev/gfdl updates (#40) - NOAA-GFDL/MOM6@cae4cfd05 Merge branch 'dev/gfdl' of github.com:wrongkindofdoctor/MOM6 into dev/gfdl - NOAA-GFDL/MOM6@ece60c11e Merge branch 'NOAA-GFDL-dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@3e27e4793 Merge branch 'dev/gfdl' of git://github.com/NOAA-GFDL/MOM6 into NOAA-GFDL-dev/gfdl - NOAA-GFDL/MOM6@59109032e Merge pull request #38 from wrongkindofdoctor/revert-37-dev/gfdl - NOAA-GFDL/MOM6@3c15a0c11 Revert "Merge in dev/gfdl updates (#37)" - NOAA-GFDL/MOM6@855d7069d Merge in dev/gfdl updates (#37) - NOAA-GFDL/MOM6@2c32568b7 merge in latest dev/gfdl updates (#36) - NOAA-GFDL/MOM6@09bcebcfe Merge pull request #35 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@124a071e4 Merge pull request #33 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@a427676bd Merge pull request #32 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@0b874f32c Merge pull request #31 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@a5386da98 Merge pull request #30 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@5b2852cde Merge pull request #28 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@22c586562 Merge pull request #27 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@f9b5a7fca Merge pull request #26 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@577208343 Merge pull request #25 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@5589d8cc3 Merge pull request #24 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@aa11e1f66 Merge pull request #23 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@b5e5c48a6 Merge pull request #22 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@911d0a240 Merge pull request #21 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@601eb679c Merge pull request #20 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@b4fd53be9 Merge pull request #19 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@f6879f425 Merge pull request #18 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@139ab1fc0 Merge pull request #17 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@a0c80dcf3 Merge pull request #16 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@42cca4f46 Merge pull request #15 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@a1c556b7f Merge pull request #14 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@f5bc54b67 Merge pull request #13 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@6ffc8976f Merge pull request #12 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@30d35a3c6 Merge pull request #11 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@1304880fb Merge pull request #10 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@522069b31 Merge pull request #9 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@1bbc8de13 Merge pull request #8 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@9aa2aaeb1 Merge pull request #7 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@b7f50fcbf Merge remote-tracking branch 'GFDL_MOM6/dev/gfdl' into dev/gfdl merge in latest MOM updates * GFDL_MOM6/dev/gfdl: (220 commits) Update cache dir for /lustre/f2 Update cache dir for /lustre/f2 Calculate height-related diagnostics in Z Set coord_adapt and coord_slight parameters in H Corrected comments in build_zlike_column +Pass max_depth to initialize_regridding in Z Corrected comments in build_sigma_column Combined scaling factors in build_adapt_column Clarified comments in Idealized_Hurricane +Recast MOM_diag_to_Z to work in units of Z +Recast MOM_ALE_sponge to work in units of Z +Added m_to_Z arg to horiz_interp_and_extrap_tracer Find energetic_PBL column height changes in Z +Find diapyc_energy_req column height changes in Z Use local variables to rescale in MOM_Point_Accel Recast MOM_sum_output to work in units of Z Simplify MOM_diagnostics code +Rescale depth inside of MEKE_lengthScales_0d +Add conversion argument to register_static_field Rescale values reported by PointAccel ... - NOAA-GFDL/MOM6@975262dc9 Merge pull request #5 from NOAA-GFDL/dev/gfdl
Hallberg-NOAA
added a commit
that referenced
this pull request
Jan 3, 2022
Updated the version of MOM6 that MOM6-examples points to, and updated those MOM_parameter_doc.all files to reflect new runtime options. All answers in the MOM6-examples test suite and TC tests are bitwise identical, but some of these changes can change solutions, mostly fixing cases that did not work previously. The non-merge MOM6 commits that are included in this update are: - NOAA-GFDL/MOM6@2d3263108 Option to homogenize forces and fluxes (#51) - NOAA-GFDL/MOM6@71cf8316b Merge pull request #37 from Hallberg-NOAA/offline_tracer_fix - NOAA-GFDL/MOM6@2b2214d9b (*)Use por_face_area in zonal_face_thickness - NOAA-GFDL/MOM6@5ad8a2cd1 Deleted commented out offline tracer lines - NOAA-GFDL/MOM6@1028ee035 Merge pull request #43 from Hallberg-NOAA/opacity_rescale - NOAA-GFDL/MOM6@d9d82e325 Eliminate unneeded diagnostic arrays in CorAdCalc - NOAA-GFDL/MOM6@5d4e8a19f (*)Removed problematic offline tracer lines - NOAA-GFDL/MOM6@0544f9f2e +(*)Avoid segmentation faults if PEN_SW_NBANDS = 0 - NOAA-GFDL/MOM6@049241ce1 +Rescaled optics%opacity_band - NOAA-GFDL/MOM6@86eb106ac Correct the units in two comments - NOAA-GFDL/MOM6@112ac4998 +(*)Revised offline tracer algorithms - NOAA-GFDL/MOM6@fcfd238ab +Refactored and rescaled the offline tracer code - NOAA-GFDL/MOM6@05edb63da (*)Offline tracer read bug fix - NOAA-GFDL/MOM6@90739bea1 Correct comments describing advect_tracer args - NOAA-GFDL/MOM6@5172c495c Warn if opacity_from_chl is called without fluxes - NOAA-GFDL/MOM6@d7337145e (*)Fix extract_diabatic_member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Original scalar flux diagnostics were implemented as
integrals. Global average versions added for convenience.
Diags will be especially useful in monitoring coupled runs.
Modified diag_tables:
ice_ocean_SIS2/OM4_025/diag_table.MOM6
ocean_only/global_ALE/common/diag_table