New version of FMS and coupler submodules (verona) #99
Labels
Comments
Hallberg-NOAA
added a commit
to Hallberg-NOAA/MOM6-examples
that referenced
this issue
Mar 27, 2019
Updated the versions of MOM6 and SIS2 in the MOM6_examples. The MOM6 changes add new downsampled diagnostic capabilities and new arguments to step_MOM to support interspersed ice coupling. The SIS2 changes are a significant restructuring to enable interspersed ice coupling, clean-up and document the code, and introduce multiple new runtime parameters. Also updated the version of the coupler being used to the Xanadu-prerelease version. The SIS2 changes do change (and improve) answers with the concurrent ice mode of coupling. There are updated versions of the SIS_parameter_doc and MOM_parameter_doc files. The MOM6 and SIS2 commits with this PR include: - NOAA-GFDL/MOM6@00f634b Merge pull request #869 from nikizadehgfdl/nikizadeh_diag_decimation - NOAA-GFDL/MOM6@3ebcb68 Merge pull request #896 from Hallberg-NOAA/coupling_options - NOAA-GFDL/MOM6@9997f41 Merge pull request #897 from nikizadehgfdl/nikizadehgfdl/fix_openmp_answers - NOAA-GFDL/MOM6@0a1a313 Correct thermo clock with update_ocean_model calls - NOAA-GFDL/MOM6@1603ed9 Fix bug causing openmp answers change - NOAA-GFDL/MOM6@b6fa342 +Opt args to step_MOM can override DIABATIC_FIRST - NOAA-GFDL/MOM6@0ff4c5b Trap or deal with instances when dt=0 in diabatic - NOAA-GFDL/MOM6@9b7b127 +New variants of safe_alloc_ptr & safe_alloc_alloc - NOAA-GFDL/MOM6@8233da2 Diagnostics downsampling, shorten line more than 120 chars long - NOAA-GFDL/MOM6@6d77f39 Merge branch 'dev/gfdl' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@48a4915 Merge branch 'nikizadehgfdl/fix_compile_generics' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@9d7099f Merge branch 'dev/gfdl' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@c98fb73 Diagnostics Downsample, implement Hallberg's suggestion - NOAA-GFDL/MOM6@1cfc384 Downsample Diagnostics, fix symmetric memory case - NOAA-GFDL/MOM6@16fef4f Diagnostics downsampling, fix the issue for symmetric case - NOAA-GFDL/MOM6@fe0c041 Diagnostics downsampling, implement suggestions in reviews - NOAA-GFDL/MOM6@de8f1b6 Diag decimation, check the commensurate condition - NOAA-GFDL/MOM6@861397c Merge branch 'dev/gfdl' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@d748764 Diag decimation, fixed the decimated fields indices - NOAA-GFDL/MOM6@0a3335f Diag decimation prototype, decimation algorithm extension - NOAA-GFDL/MOM6@2dd042a Diag decimation prototype, first attemp at general algorithm - NOAA-GFDL/MOM6@373c232 Diag decimation prototype, fix masks for non-native grids - NOAA-GFDL/MOM6@5f3949f Diag decimation prototype, fixed masks and cleanup - NOAA-GFDL/MOM6@dfe674c Diag decimation prototype, aggregating methods - NOAA-GFDL/MOM6@7e3d368 Diag decimation prototype, fixing memory leaks - NOAA-GFDL/MOM6@8802dd2 Diag decimation prototype, requesting in diag_table - NOAA-GFDL/MOM6@d1b15c4 Diag decimation prototype, requesting in - NOAA-GFDL/MOM6@diag_table - NOAA-GFDL/MOM6@b9d714b Diag decimation prototype, works for native and _z - NOAA-GFDL/MOM6@7c4adcb Diag decimation prototype, coarsening by a factor of 2 - NOAA-GFDL/MOM6@dcdd9ae Effort to decimate the diag output at runtime - NOAA-GFDL/SIS2@e9434c5 Merge pull request NOAA-GFDL#99 from Hallberg-NOAA/restructure_dyn2 - NOAA-GFDL/SIS2@fd49919 Merge pull request NOAA-GFDL#98 from Hallberg-NOAA/restructure_dynamics - NOAA-GFDL/SIS2@8d30b9c Revised OMP directives in SIS_continuity - NOAA-GFDL/SIS2@d1d011a (*)+Add end_call optional arg to SIS_merged_dyn_cont - NOAA-GFDL/SIS2@86714ab +Add DT_COUPLED_ICE_OCEAN_DYN to ice_ocean_driver - NOAA-GFDL/SIS2@aacd3ad +Pass optional args to update_ice_dynamics_trans - NOAA-GFDL/SIS2@5d5257c +Add optional arguments to SIS_multi_dyn_trans - NOAA-GFDL/SIS2@38f6fd8 +Added ice_mass_from_IST - NOAA-GFDL/SIS2@c0bb017 +Set and unset valid_IST - NOAA-GFDL/SIS2@fcde2c1 (*)Added pond mass in ice pressure. - NOAA-GFDL/SIS2@c974b2d Renamed coupled driver log root CIOD_parameter_doc - NOAA-GFDL/SIS2@bc3362b +Added the new runtime flag INTERSPERSE_ICE_OCEAN - NOAA-GFDL/SIS2@a5519c5 +New optional args for update_ice_dynamics_trans - NOAA-GFDL/SIS2@75f907d +Added IST%valid_IST and IOF%mass_ice_sn_p - NOAA-GFDL/SIS2@3a61538 Corrected diagnostic messages in specified_ice - NOAA-GFDL/SIS2@938f950 Commented on the SIS_dynamics_trans code - NOAA-GFDL/SIS2@6e7094a SIS_multi_dyn_trans code in SIS_dyanmics_trans - NOAA-GFDL/SIS2@ed9505f +(*)Prohibit WARSAW_SUM_ORDER and MERGED_CONTINUITY - NOAA-GFDL/SIS2@cf06501 +Create 3 new subroutines from SIS_multi_dyn_trans - NOAA-GFDL/SIS2@7a25763 +Created new module specified_ice - NOAA-GFDL/SIS2@36f13b4 +Created new module SIS_ice_diags - NOAA-GFDL/SIS2@f6225f5 +Created ice_state_diags type - NOAA-GFDL/SIS2@af57845 +Split dyn_state_2d type ouf of dyn_trans_CS - NOAA-GFDL/SIS2@a3ca222 +Added SIS_merged_dyn_cont - NOAA-GFDL/SIS2@d94c403 (*)Corrected time argument to ice_cat_transport - NOAA-GFDL/SIS2@567963d (*)Introduce dt_adv_cycle in SIS_multi_dyn_trans - NOAA-GFDL/SIS2@3fbf01c Move code out of SIS_multi_dyn_trans dynamics loop - NOAA-GFDL/SIS2@9e2b5d1 Add advective cycle loop in SIS_multi_dyn_trans - NOAA-GFDL/SIS2@ff19e8f +Add DT_ICE_ADVECT and remove MAX_TRACER_SUBSTEPS - NOAA-GFDL/SIS2@0c21435 (*)Standardized parentheses in summed_continuity - NOAA-GFDL/SIS2@5b8a1fa +Added increase_max_tracer_step_memory - NOAA-GFDL/SIS2@caedb96 +Added mi_sum and other elements to dyn_trans_CS - NOAA-GFDL/SIS2@eef65be (*)Change ice_free calculation in SIS_dyn_trans - NOAA-GFDL/SIS2@2979c50 +(*)INCONSISTENT_COVER_BUG=False if MERGED_CONT=True - NOAA-GFDL/SIS2@8094582 +Added INCONSISTENT_COVER_BUG runtime parameter - NOAA-GFDL/SIS2@c159885 Reduce reporting tolerance of sum_part_size errors - NOAA-GFDL/SIS2@ef16e22 Replaced misp_sum with CS%mca_step(:,:,n) - NOAA-GFDL/SIS2@6e3792e Shifted the time-step index for CS%mca_step - NOAA-GFDL/SIS2@28955cc +Added new subroutine SIS_multi_dyn_trans - NOAA-GFDL/SIS2@59341f5 (*)+Added calls correcting MERGED_CONTINUITY - NOAA-GFDL/SIS2@6b39542 +Added ice_cover_transport - NOAA-GFDL/SIS2@06a03da +Pass complete_ice_cover to set_wind_stresses_[BC] - NOAA-GFDL/SIS2@5965e3e (*)Corrected a halo update in SIS_dyn_trans - NOAA-GFDL/SIS2@38cecbe +Always allocate IST%u_ice_C and IST%v_ice_C - NOAA-GFDL/SIS2@9d5589e +Introduced slab_ice_dyn_trans - NOAA-GFDL/SIS2@2a5356a +Added IST%snow_to_ocn and IST%enth_snow_to_ocn - NOAA-GFDL/SIS2@1c1ad48 +Introduced specified_ice_dynamics - NOAA-GFDL/SIS2@ae3735b Paired B-velocity checksum calls in IST_chksum - NOAA-GFDL/SIS2@8c7dd19 +Changed interface to ice_line - NOAA-GFDL/SIS2@3d718e8 Merge branch 'dev/gfdl' into restructure_dynamics - NOAA-GFDL/SIS2@12a290b Merge branch 'nikizadehgfdl-fix_ice_restore_issues' into dev/gfdl - NOAA-GFDL/SIS2@adc33ee Merge branch 'fix_ice_restore_issues' of https://github.com/nikizadehgfdl/SIS2 into nikizadehgfdl-fix_ice_restore_issues - NOAA-GFDL/SIS2@340c19e Documented 98 nondimensional variable units - NOAA-GFDL/SIS2@2e32660 Documented 53 enthalpy-related variable units - NOAA-GFDL/SIS2@0c114e6 Documented 72 salinity-related variable units - NOAA-GFDL/SIS2@62e1aa1 Documented 48 tracer-related variable units - NOAA-GFDL/SIS2@d3355b6 Documented 101 length and stress variable units - NOAA-GFDL/SIS2@cc1e58b Documented 212 length and velocity variable units - NOAA-GFDL/SIS2@6298e8f Documented 116 thickness variable units - NOAA-GFDL/SIS2@76c6651 Documented 65 heat content variable units - NOAA-GFDL/SIS2@e8d65be Documented 82 time variable units - NOAA-GFDL/SIS2@42d6116 Documented 105 heat flux variable units - NOAA-GFDL/SIS2@e7de91a Documented 206 density variable units - NOAA-GFDL/SIS2@b45fccd ocumented 123 stress variable units - NOAA-GFDL/SIS2@e84a0ce ocumented 142 thermodynamic variable units - NOAA-GFDL/SIS2@2d08207 Added set_wind_stresses_C and set_wind_stresses_B - NOAA-GFDL/SIS2@50423df +(*)Added the runtime parameter WARSAW_SUM_ORDER - NOAA-GFDL/SIS2@d8fdc91 (*)Set mca_step(:,:,1) from misp_sum(:,:) - NOAA-GFDL/SIS2@3b82d4f Corrected uh_tot size in zonal_mass_flux - NOAA-GFDL/SIS2@5ec4861 +Eliminated ice_transport - NOAA-GFDL/SIS2@b71e5b2 +Store the total transports for advective substeps - NOAA-GFDL/SIS2@5356f5a Spread out and collect common ice_transport calls - NOAA-GFDL/SIS2@7771010 +Made snow2ice optional for finish_ice_transport - NOAA-GFDL/SIS2@fbe33c5 +Call separate parts of ice_transport on a B-grid - NOAA-GFDL/SIS2@78bc652 +Add cell_mass_from_CAS & new arg to ice_transport - NOAA-GFDL/SIS2@e35b406 Fix the ice restoring issues - NOAA-GFDL/SIS2@bb60e7a +Call separate parts of ice_transport - NOAA-GFDL/SIS2@2bb7749 +Added continuity_CSp arg to SIS_transport_init - NOAA-GFDL/SIS2@a04688c +Changed interface to ice_cat_transport - NOAA-GFDL/SIS2@4f06216 Store fluxes from continuity substeps - NOAA-GFDL/SIS2@78beaed +Added h_in argument to summed_continuity - NOAA-GFDL/SIS2@e52e43f +Added ice_cat_transport and finish_ice_transport - NOAA-GFDL/SIS2@47270bf +Call slab_ice code from SIS_dyn_trans - NOAA-GFDL/SIS2@6079251 +Added nsteps argument to ice_transport - NOAA-GFDL/SIS2@d3d184e +Store mass and enthalpy in cell_average_state_type - NOAA-GFDL/SIS2@90a4cb7 +Added module slab_ice - NOAA-GFDL/SIS2@6c6df59 +Changed interface to compress_ice - NOAA-GFDL/SIS2@3706248 +Use elements of CAS for ice transport diagnostics - NOAA-GFDL/SIS2@bfb4c5f Fix restart issue when DO_ICE_RESTORE=True - NOAA-GFDL/SIS2@da8a82f +Changed arguments to slab_ice_advect - NOAA-GFDL/SIS2@7293fbb +Added cell_ave_state_to_ice_state - NOAA-GFDL/SIS2@20ca2a1 +Added ice_state_to_cell_ave_state - NOAA-GFDL/SIS2@54270a8 Made IG intent(in) in SIS_tracer_advect.F90 - NOAA-GFDL/SIS2@1c6e582 +Added cell_average_state_type & related routines - NOAA-GFDL/SIS2@3790877 Fix restart issue when DO_ICE_RESTORE=True - NOAA-GFDL/SIS2@51bcbb9 +Refactored subroutines finding total ice amounts - NOAA-GFDL/SIS2@533a866 +(*)Consolidated slab_ice advection code - NOAA-GFDL/SIS2@47427c4 +Replaced 5 arguments to ice_transport with IST - NOAA-GFDL/SIS2@a9b178e Eliminated an unneeded pass_var call for part_sz - NOAA-GFDL/SIS2@aacde82 Rearranged code in SIS_dynamics_trans - NOAA-GFDL/SIS2@fe740e6 +Added MERGED_CONTINUITY runtime option - NOAA-GFDL/SIS2@6b0af86 +Added proportionate_continuity - NOAA-GFDL/SIS2@04a9793 +Add summed_continuity & alter zonal_mass_flux - NOAA-GFDL/SIS2@572fbc3 +Moved ridging diagnostics into ice_transport - NOAA-GFDL/SIS2@02bf864 +(*)Replaced msnow args to dynamics with misp - NOAA-GFDL/SIS2@c8dcff8 +Moves XPRT diagnostic into SIS_transport
Hallberg-NOAA
added a commit
to Hallberg-NOAA/MOM6-examples
that referenced
this issue
Mar 27, 2019
Updated the versions of MOM6 and SIS2 in the MOM6_examples. The MOM6 changes add new downsampled diagnostic capabilities and new arguments to step_MOM to support interspersed ice coupling. The SIS2 changes are a significant restructuring to enable interspersed ice coupling, clean-up and document the code, and introduce multiple new runtime parameters. Also updated the version of the coupler being used to the Xanadu-prerelease version. The SIS2 changes can change answers in cases that are not tested by MOM6_examples. There are updated versions of the SIS_parameter_doc and MOM_parameter_doc files. The MOM6 and SIS2 commits with this PR include: - NOAA-GFDL/MOM6@00f634b Merge pull request #869 from nikizadehgfdl/nikizadeh_diag_decimation - NOAA-GFDL/MOM6@3ebcb68 Merge pull request #896 from Hallberg-NOAA/coupling_options - NOAA-GFDL/MOM6@9997f41 Merge pull request #897 from nikizadehgfdl/nikizadehgfdl/fix_openmp_answers - NOAA-GFDL/MOM6@0a1a313 Correct thermo clock with update_ocean_model calls - NOAA-GFDL/MOM6@1603ed9 Fix bug causing openmp answers change - NOAA-GFDL/MOM6@b6fa342 +Opt args to step_MOM can override DIABATIC_FIRST - NOAA-GFDL/MOM6@0ff4c5b Trap or deal with instances when dt=0 in diabatic - NOAA-GFDL/MOM6@9b7b127 +New variants of safe_alloc_ptr & safe_alloc_alloc - NOAA-GFDL/MOM6@8233da2 Diagnostics downsampling, shorten line more than 120 chars long - NOAA-GFDL/MOM6@6d77f39 Merge branch 'dev/gfdl' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@48a4915 Merge branch 'nikizadehgfdl/fix_compile_generics' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@9d7099f Merge branch 'dev/gfdl' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@c98fb73 Diagnostics Downsample, implement Hallberg's suggestion - NOAA-GFDL/MOM6@1cfc384 Downsample Diagnostics, fix symmetric memory case - NOAA-GFDL/MOM6@16fef4f Diagnostics downsampling, fix the issue for symmetric case - NOAA-GFDL/MOM6@fe0c041 Diagnostics downsampling, implement suggestions in reviews - NOAA-GFDL/MOM6@de8f1b6 Diag decimation, check the commensurate condition - NOAA-GFDL/MOM6@861397c Merge branch 'dev/gfdl' into nikizadeh_diag_decimation - NOAA-GFDL/MOM6@d748764 Diag decimation, fixed the decimated fields indices - NOAA-GFDL/MOM6@0a3335f Diag decimation prototype, decimation algorithm extension - NOAA-GFDL/MOM6@2dd042a Diag decimation prototype, first attemp at general algorithm - NOAA-GFDL/MOM6@373c232 Diag decimation prototype, fix masks for non-native grids - NOAA-GFDL/MOM6@5f3949f Diag decimation prototype, fixed masks and cleanup - NOAA-GFDL/MOM6@dfe674c Diag decimation prototype, aggregating methods - NOAA-GFDL/MOM6@7e3d368 Diag decimation prototype, fixing memory leaks - NOAA-GFDL/MOM6@8802dd2 Diag decimation prototype, requesting in diag_table - NOAA-GFDL/MOM6@d1b15c4 Diag decimation prototype, requesting in - NOAA-GFDL/MOM6@diag_table - NOAA-GFDL/MOM6@b9d714b Diag decimation prototype, works for native and _z - NOAA-GFDL/MOM6@7c4adcb Diag decimation prototype, coarsening by a factor of 2 - NOAA-GFDL/MOM6@dcdd9ae Effort to decimate the diag output at runtime - NOAA-GFDL/SIS2@e9434c5 Merge pull request NOAA-GFDL#99 from Hallberg-NOAA/restructure_dyn2 - NOAA-GFDL/SIS2@fd49919 Merge pull request NOAA-GFDL#98 from Hallberg-NOAA/restructure_dynamics - NOAA-GFDL/SIS2@8d30b9c Revised OMP directives in SIS_continuity - NOAA-GFDL/SIS2@d1d011a (*)+Add end_call optional arg to SIS_merged_dyn_cont - NOAA-GFDL/SIS2@86714ab +Add DT_COUPLED_ICE_OCEAN_DYN to ice_ocean_driver - NOAA-GFDL/SIS2@aacd3ad +Pass optional args to update_ice_dynamics_trans - NOAA-GFDL/SIS2@5d5257c +Add optional arguments to SIS_multi_dyn_trans - NOAA-GFDL/SIS2@38f6fd8 +Added ice_mass_from_IST - NOAA-GFDL/SIS2@c0bb017 +Set and unset valid_IST - NOAA-GFDL/SIS2@fcde2c1 (*)Added pond mass in ice pressure. - NOAA-GFDL/SIS2@c974b2d Renamed coupled driver log root CIOD_parameter_doc - NOAA-GFDL/SIS2@bc3362b +Added the new runtime flag INTERSPERSE_ICE_OCEAN - NOAA-GFDL/SIS2@a5519c5 +New optional args for update_ice_dynamics_trans - NOAA-GFDL/SIS2@75f907d +Added IST%valid_IST and IOF%mass_ice_sn_p - NOAA-GFDL/SIS2@3a61538 Corrected diagnostic messages in specified_ice - NOAA-GFDL/SIS2@938f950 Commented on the SIS_dynamics_trans code - NOAA-GFDL/SIS2@6e7094a SIS_multi_dyn_trans code in SIS_dyanmics_trans - NOAA-GFDL/SIS2@ed9505f +(*)Prohibit WARSAW_SUM_ORDER and MERGED_CONTINUITY - NOAA-GFDL/SIS2@cf06501 +Create 3 new subroutines from SIS_multi_dyn_trans - NOAA-GFDL/SIS2@7a25763 +Created new module specified_ice - NOAA-GFDL/SIS2@36f13b4 +Created new module SIS_ice_diags - NOAA-GFDL/SIS2@f6225f5 +Created ice_state_diags type - NOAA-GFDL/SIS2@af57845 +Split dyn_state_2d type ouf of dyn_trans_CS - NOAA-GFDL/SIS2@a3ca222 +Added SIS_merged_dyn_cont - NOAA-GFDL/SIS2@d94c403 (*)Corrected time argument to ice_cat_transport - NOAA-GFDL/SIS2@567963d (*)Introduce dt_adv_cycle in SIS_multi_dyn_trans - NOAA-GFDL/SIS2@3fbf01c Move code out of SIS_multi_dyn_trans dynamics loop - NOAA-GFDL/SIS2@9e2b5d1 Add advective cycle loop in SIS_multi_dyn_trans - NOAA-GFDL/SIS2@ff19e8f +Add DT_ICE_ADVECT and remove MAX_TRACER_SUBSTEPS - NOAA-GFDL/SIS2@0c21435 (*)Standardized parentheses in summed_continuity - NOAA-GFDL/SIS2@5b8a1fa +Added increase_max_tracer_step_memory - NOAA-GFDL/SIS2@caedb96 +Added mi_sum and other elements to dyn_trans_CS - NOAA-GFDL/SIS2@eef65be (*)Change ice_free calculation in SIS_dyn_trans - NOAA-GFDL/SIS2@2979c50 +(*)INCONSISTENT_COVER_BUG=False if MERGED_CONT=True - NOAA-GFDL/SIS2@8094582 +Added INCONSISTENT_COVER_BUG runtime parameter - NOAA-GFDL/SIS2@c159885 Reduce reporting tolerance of sum_part_size errors - NOAA-GFDL/SIS2@ef16e22 Replaced misp_sum with CS%mca_step(:,:,n) - NOAA-GFDL/SIS2@6e3792e Shifted the time-step index for CS%mca_step - NOAA-GFDL/SIS2@28955cc +Added new subroutine SIS_multi_dyn_trans - NOAA-GFDL/SIS2@59341f5 (*)+Added calls correcting MERGED_CONTINUITY - NOAA-GFDL/SIS2@6b39542 +Added ice_cover_transport - NOAA-GFDL/SIS2@06a03da +Pass complete_ice_cover to set_wind_stresses_[BC] - NOAA-GFDL/SIS2@5965e3e (*)Corrected a halo update in SIS_dyn_trans - NOAA-GFDL/SIS2@38cecbe +Always allocate IST%u_ice_C and IST%v_ice_C - NOAA-GFDL/SIS2@9d5589e +Introduced slab_ice_dyn_trans - NOAA-GFDL/SIS2@2a5356a +Added IST%snow_to_ocn and IST%enth_snow_to_ocn - NOAA-GFDL/SIS2@1c1ad48 +Introduced specified_ice_dynamics - NOAA-GFDL/SIS2@ae3735b Paired B-velocity checksum calls in IST_chksum - NOAA-GFDL/SIS2@8c7dd19 +Changed interface to ice_line - NOAA-GFDL/SIS2@3d718e8 Merge branch 'dev/gfdl' into restructure_dynamics - NOAA-GFDL/SIS2@12a290b Merge branch 'nikizadehgfdl-fix_ice_restore_issues' into dev/gfdl - NOAA-GFDL/SIS2@adc33ee Merge branch 'fix_ice_restore_issues' of https://github.com/nikizadehgfdl/SIS2 into nikizadehgfdl-fix_ice_restore_issues - NOAA-GFDL/SIS2@340c19e Documented 98 nondimensional variable units - NOAA-GFDL/SIS2@2e32660 Documented 53 enthalpy-related variable units - NOAA-GFDL/SIS2@0c114e6 Documented 72 salinity-related variable units - NOAA-GFDL/SIS2@62e1aa1 Documented 48 tracer-related variable units - NOAA-GFDL/SIS2@d3355b6 Documented 101 length and stress variable units - NOAA-GFDL/SIS2@cc1e58b Documented 212 length and velocity variable units - NOAA-GFDL/SIS2@6298e8f Documented 116 thickness variable units - NOAA-GFDL/SIS2@76c6651 Documented 65 heat content variable units - NOAA-GFDL/SIS2@e8d65be Documented 82 time variable units - NOAA-GFDL/SIS2@42d6116 Documented 105 heat flux variable units - NOAA-GFDL/SIS2@e7de91a Documented 206 density variable units - NOAA-GFDL/SIS2@b45fccd ocumented 123 stress variable units - NOAA-GFDL/SIS2@e84a0ce ocumented 142 thermodynamic variable units - NOAA-GFDL/SIS2@2d08207 Added set_wind_stresses_C and set_wind_stresses_B - NOAA-GFDL/SIS2@50423df +(*)Added the runtime parameter WARSAW_SUM_ORDER - NOAA-GFDL/SIS2@d8fdc91 (*)Set mca_step(:,:,1) from misp_sum(:,:) - NOAA-GFDL/SIS2@3b82d4f Corrected uh_tot size in zonal_mass_flux - NOAA-GFDL/SIS2@5ec4861 +Eliminated ice_transport - NOAA-GFDL/SIS2@b71e5b2 +Store the total transports for advective substeps - NOAA-GFDL/SIS2@5356f5a Spread out and collect common ice_transport calls - NOAA-GFDL/SIS2@7771010 +Made snow2ice optional for finish_ice_transport - NOAA-GFDL/SIS2@fbe33c5 +Call separate parts of ice_transport on a B-grid - NOAA-GFDL/SIS2@78bc652 +Add cell_mass_from_CAS & new arg to ice_transport - NOAA-GFDL/SIS2@e35b406 Fix the ice restoring issues - NOAA-GFDL/SIS2@bb60e7a +Call separate parts of ice_transport - NOAA-GFDL/SIS2@2bb7749 +Added continuity_CSp arg to SIS_transport_init - NOAA-GFDL/SIS2@a04688c +Changed interface to ice_cat_transport - NOAA-GFDL/SIS2@4f06216 Store fluxes from continuity substeps - NOAA-GFDL/SIS2@78beaed +Added h_in argument to summed_continuity - NOAA-GFDL/SIS2@e52e43f +Added ice_cat_transport and finish_ice_transport - NOAA-GFDL/SIS2@47270bf +Call slab_ice code from SIS_dyn_trans - NOAA-GFDL/SIS2@6079251 +Added nsteps argument to ice_transport - NOAA-GFDL/SIS2@d3d184e +Store mass and enthalpy in cell_average_state_type - NOAA-GFDL/SIS2@90a4cb7 +Added module slab_ice - NOAA-GFDL/SIS2@6c6df59 +Changed interface to compress_ice - NOAA-GFDL/SIS2@3706248 +Use elements of CAS for ice transport diagnostics - NOAA-GFDL/SIS2@bfb4c5f Fix restart issue when DO_ICE_RESTORE=True - NOAA-GFDL/SIS2@da8a82f +Changed arguments to slab_ice_advect - NOAA-GFDL/SIS2@7293fbb +Added cell_ave_state_to_ice_state - NOAA-GFDL/SIS2@20ca2a1 +Added ice_state_to_cell_ave_state - NOAA-GFDL/SIS2@54270a8 Made IG intent(in) in SIS_tracer_advect.F90 - NOAA-GFDL/SIS2@1c6e582 +Added cell_average_state_type & related routines - NOAA-GFDL/SIS2@3790877 Fix restart issue when DO_ICE_RESTORE=True - NOAA-GFDL/SIS2@51bcbb9 +Refactored subroutines finding total ice amounts - NOAA-GFDL/SIS2@533a866 +(*)Consolidated slab_ice advection code - NOAA-GFDL/SIS2@47427c4 +Replaced 5 arguments to ice_transport with IST - NOAA-GFDL/SIS2@a9b178e Eliminated an unneeded pass_var call for part_sz - NOAA-GFDL/SIS2@aacde82 Rearranged code in SIS_dynamics_trans - NOAA-GFDL/SIS2@fe740e6 +Added MERGED_CONTINUITY runtime option - NOAA-GFDL/SIS2@6b0af86 +Added proportionate_continuity - NOAA-GFDL/SIS2@04a9793 +Add summed_continuity & alter zonal_mass_flux - NOAA-GFDL/SIS2@572fbc3 +Moved ridging diagnostics into ice_transport - NOAA-GFDL/SIS2@02bf864 +(*)Replaced msnow args to dynamics with misp - NOAA-GFDL/SIS2@c8dcff8 +Moves XPRT diagnostic into SIS_transport
adcroft
added a commit
that referenced
this issue
Apr 11, 2019
…gfdl Updates SIS_parameter_doc and available diags. SIS2 commits: - NOAA-GFDL/SIS2@d9bf834 Merge branch 'Hallberg-NOAA-remove_Verona_interfaces' into dev/gfdl - NOAA-GFDL/SIS2@c9ff8d5 +Remove the old Verona sea-ice coupling interfaces - NOAA-GFDL/SIS2@e9434c5 Merge pull request #99 from Hallberg-NOAA/restructure_dyn2 - NOAA-GFDL/SIS2@fd49919 Merge pull request #98 from Hallberg-NOAA/restructure_dynamics - NOAA-GFDL/SIS2@8d30b9c Revised OMP directives in SIS_continuity - NOAA-GFDL/SIS2@d1d011a (*)+Add end_call optional arg to SIS_merged_dyn_cont - NOAA-GFDL/SIS2@86714ab +Add DT_COUPLED_ICE_OCEAN_DYN to ice_ocean_driver - NOAA-GFDL/SIS2@aacd3ad +Pass optional args to update_ice_dynamics_trans - NOAA-GFDL/SIS2@5d5257c +Add optional arguments to SIS_multi_dyn_trans - NOAA-GFDL/SIS2@38f6fd8 +Added ice_mass_from_IST - NOAA-GFDL/SIS2@c0bb017 +Set and unset valid_IST - NOAA-GFDL/SIS2@fcde2c1 (*)Added pond mass in ice pressure. - NOAA-GFDL/SIS2@c974b2d Renamed coupled driver log root CIOD_parameter_doc - NOAA-GFDL/SIS2@bc3362b +Added the new runtime flag INTERSPERSE_ICE_OCEAN - NOAA-GFDL/SIS2@a5519c5 +New optional args for update_ice_dynamics_trans - NOAA-GFDL/SIS2@75f907d +Added IST%valid_IST and IOF%mass_ice_sn_p - NOAA-GFDL/SIS2@3a61538 Corrected diagnostic messages in specified_ice - NOAA-GFDL/SIS2@938f950 Commented on the SIS_dynamics_trans code - NOAA-GFDL/SIS2@6e7094a SIS_multi_dyn_trans code in SIS_dyanmics_trans - NOAA-GFDL/SIS2@ed9505f +(*)Prohibit WARSAW_SUM_ORDER and MERGED_CONTINUITY - NOAA-GFDL/SIS2@cf06501 +Create 3 new subroutines from SIS_multi_dyn_trans - NOAA-GFDL/SIS2@7a25763 +Created new module specified_ice - NOAA-GFDL/SIS2@36f13b4 +Created new module SIS_ice_diags - NOAA-GFDL/SIS2@f6225f5 +Created ice_state_diags type - NOAA-GFDL/SIS2@af57845 +Split dyn_state_2d type ouf of dyn_trans_CS - NOAA-GFDL/SIS2@a3ca222 +Added SIS_merged_dyn_cont - NOAA-GFDL/SIS2@d94c403 (*)Corrected time argument to ice_cat_transport - NOAA-GFDL/SIS2@567963d (*)Introduce dt_adv_cycle in SIS_multi_dyn_trans - NOAA-GFDL/SIS2@3fbf01c Move code out of SIS_multi_dyn_trans dynamics loop - NOAA-GFDL/SIS2@9e2b5d1 Add advective cycle loop in SIS_multi_dyn_trans - NOAA-GFDL/SIS2@ff19e8f +Add DT_ICE_ADVECT and remove MAX_TRACER_SUBSTEPS - NOAA-GFDL/SIS2@0c21435 (*)Standardized parentheses in summed_continuity - NOAA-GFDL/SIS2@5b8a1fa +Added increase_max_tracer_step_memory - NOAA-GFDL/SIS2@caedb96 +Added mi_sum and other elements to dyn_trans_CS - NOAA-GFDL/SIS2@eef65be (*)Change ice_free calculation in SIS_dyn_trans - NOAA-GFDL/SIS2@2979c50 +(*)INCONSISTENT_COVER_BUG=False if MERGED_CONT=True - NOAA-GFDL/SIS2@8094582 +Added INCONSISTENT_COVER_BUG runtime parameter - NOAA-GFDL/SIS2@c159885 Reduce reporting tolerance of sum_part_size errors - NOAA-GFDL/SIS2@ef16e22 Replaced misp_sum with CS%mca_step(:,:,n) - NOAA-GFDL/SIS2@6e3792e Shifted the time-step index for CS%mca_step - NOAA-GFDL/SIS2@28955cc +Added new subroutine SIS_multi_dyn_trans - NOAA-GFDL/SIS2@59341f5 (*)+Added calls correcting MERGED_CONTINUITY - NOAA-GFDL/SIS2@6b39542 +Added ice_cover_transport - NOAA-GFDL/SIS2@06a03da +Pass complete_ice_cover to set_wind_stresses_[BC] - NOAA-GFDL/SIS2@5965e3e (*)Corrected a halo update in SIS_dyn_trans - NOAA-GFDL/SIS2@38cecbe +Always allocate IST%u_ice_C and IST%v_ice_C - NOAA-GFDL/SIS2@9d5589e +Introduced slab_ice_dyn_trans - NOAA-GFDL/SIS2@2a5356a +Added IST%snow_to_ocn and IST%enth_snow_to_ocn - NOAA-GFDL/SIS2@1c1ad48 +Introduced specified_ice_dynamics - NOAA-GFDL/SIS2@ae3735b Paired B-velocity checksum calls in IST_chksum - NOAA-GFDL/SIS2@8c7dd19 +Changed interface to ice_line - NOAA-GFDL/SIS2@3d718e8 Merge branch 'dev/gfdl' into restructure_dynamics - NOAA-GFDL/SIS2@12a290b Merge branch 'nikizadehgfdl-fix_ice_restore_issues' into dev/gfdl - NOAA-GFDL/SIS2@adc33ee Merge branch 'fix_ice_restore_issues' of https://github.com/nikizadehgfdl/SIS2 into nikizadehgfdl-fix_ice_restore_issues - NOAA-GFDL/SIS2@340c19e Documented 98 nondimensional variable units - NOAA-GFDL/SIS2@2e32660 Documented 53 enthalpy-related variable units - NOAA-GFDL/SIS2@0c114e6 Documented 72 salinity-related variable units - NOAA-GFDL/SIS2@62e1aa1 Documented 48 tracer-related variable units - NOAA-GFDL/SIS2@d3355b6 Documented 101 length and stress variable units - NOAA-GFDL/SIS2@cc1e58b Documented 212 length and velocity variable units - NOAA-GFDL/SIS2@6298e8f Documented 116 thickness variable units - NOAA-GFDL/SIS2@76c6651 Documented 65 heat content variable units - NOAA-GFDL/SIS2@e8d65be Documented 82 time variable units - NOAA-GFDL/SIS2@42d6116 Documented 105 heat flux variable units - NOAA-GFDL/SIS2@e7de91a Documented 206 density variable units - NOAA-GFDL/SIS2@b45fccd ocumented 123 stress variable units - NOAA-GFDL/SIS2@e84a0ce ocumented 142 thermodynamic variable units - NOAA-GFDL/SIS2@2d08207 Added set_wind_stresses_C and set_wind_stresses_B - NOAA-GFDL/SIS2@50423df +(*)Added the runtime parameter WARSAW_SUM_ORDER - NOAA-GFDL/SIS2@d8fdc91 (*)Set mca_step(:,:,1) from misp_sum(:,:) - NOAA-GFDL/SIS2@3b82d4f Corrected uh_tot size in zonal_mass_flux - NOAA-GFDL/SIS2@5ec4861 +Eliminated ice_transport - NOAA-GFDL/SIS2@b71e5b2 +Store the total transports for advective substeps - NOAA-GFDL/SIS2@5356f5a Spread out and collect common ice_transport calls - NOAA-GFDL/SIS2@7771010 +Made snow2ice optional for finish_ice_transport - NOAA-GFDL/SIS2@fbe33c5 +Call separate parts of ice_transport on a B-grid - NOAA-GFDL/SIS2@78bc652 +Add cell_mass_from_CAS & new arg to ice_transport - NOAA-GFDL/SIS2@e35b406 Fix the ice restoring issues - NOAA-GFDL/SIS2@bb60e7a +Call separate parts of ice_transport - NOAA-GFDL/SIS2@2bb7749 +Added continuity_CSp arg to SIS_transport_init - NOAA-GFDL/SIS2@a04688c +Changed interface to ice_cat_transport - NOAA-GFDL/SIS2@4f06216 Store fluxes from continuity substeps - NOAA-GFDL/SIS2@78beaed +Added h_in argument to summed_continuity - NOAA-GFDL/SIS2@e52e43f +Added ice_cat_transport and finish_ice_transport - NOAA-GFDL/SIS2@47270bf +Call slab_ice code from SIS_dyn_trans - NOAA-GFDL/SIS2@6079251 +Added nsteps argument to ice_transport - NOAA-GFDL/SIS2@d3d184e +Store mass and enthalpy in cell_average_state_type - NOAA-GFDL/SIS2@90a4cb7 +Added module slab_ice - NOAA-GFDL/SIS2@6c6df59 +Changed interface to compress_ice - NOAA-GFDL/SIS2@3706248 +Use elements of CAS for ice transport diagnostics - NOAA-GFDL/SIS2@bfb4c5f Fix restart issue when DO_ICE_RESTORE=True - NOAA-GFDL/SIS2@da8a82f +Changed arguments to slab_ice_advect - NOAA-GFDL/SIS2@7293fbb +Added cell_ave_state_to_ice_state - NOAA-GFDL/SIS2@20ca2a1 +Added ice_state_to_cell_ave_state - NOAA-GFDL/SIS2@54270a8 Made IG intent(in) in SIS_tracer_advect.F90 - NOAA-GFDL/SIS2@1c6e582 +Added cell_average_state_type & related routines - NOAA-GFDL/SIS2@3790877 Fix restart issue when DO_ICE_RESTORE=True - NOAA-GFDL/SIS2@51bcbb9 +Refactored subroutines finding total ice amounts - NOAA-GFDL/SIS2@533a866 +(*)Consolidated slab_ice advection code - NOAA-GFDL/SIS2@47427c4 +Replaced 5 arguments to ice_transport with IST - NOAA-GFDL/SIS2@a9b178e Eliminated an unneeded pass_var call for part_sz - NOAA-GFDL/SIS2@aacde82 Rearranged code in SIS_dynamics_trans - NOAA-GFDL/SIS2@fe740e6 +Added MERGED_CONTINUITY runtime option - NOAA-GFDL/SIS2@6b0af86 +Added proportionate_continuity - NOAA-GFDL/SIS2@04a9793 +Add summed_continuity & alter zonal_mass_flux - NOAA-GFDL/SIS2@572fbc3 +Moved ridging diagnostics into ice_transport - NOAA-GFDL/SIS2@02bf864 +(*)Replaced msnow args to dynamics with misp - NOAA-GFDL/SIS2@c8dcff8 +Moves XPRT diagnostic into SIS_transport
adcroft
added a commit
that referenced
this issue
Jul 5, 2019
…into dev/master - This is a merge from NCAR onto dev/master for MOM6. - Updates parameter_doc and available_diag files. - No answer changes. - NOAA-GFDL/MOM6@7698afb Merge branch 'gustavo-marques-dev-master-candidate-2019-06-11' into dev/master - NOAA-GFDL/MOM6@5c42192 Removes trailing space - NOAA-GFDL/MOM6@8f96916 Passes optional arg. (BT=CS%barotropic_CSp) in calls to horizontal_viscosity - NOAA-GFDL/MOM6@47886e3 Changes Barotropic to BT in horizontal_viscosity - NOAA-GFDL/MOM6@31dfefd Removes Barotropic and thickness_diffuse from MOM_dynamics_unsplit* - NOAA-GFDL/MOM6@0d1fbff Issue FATAL error if SPLIT=False and USE_GME=True - NOAA-GFDL/MOM6@1a71a55 Remove thickness_diffuse_CS from horizontal_viscosity - NOAA-GFDL/MOM6@2a9d421 Set default AH_VEL_SCALE back to zero - NOAA-GFDL/MOM6@98373e8 Fix hint syntax in MOM_obsolete_param - NOAA-GFDL/MOM6@89168bf move OMP calls below GME and above the K-loop - NOAA-GFDL/MOM6@afb07fb Add MEKE_GEOMETRIC_EPSILON - NOAA-GFDL/MOM6@062e3b0 Obsolete parameter MEKE_VISCOSITY_COEFF - NOAA-GFDL/MOM6@2ada29a Adds MEKE_VISCOSITY_COEFF_AU and MEKE_VISCOSITY_COEFF_KU into the MEKE documentation - NOAA-GFDL/MOM6@31dda12 Merge branch 'dev/master' into dev-master-candidate-2019-06-11 - NOAA-GFDL/MOM6@91d0e26 Merge pull request #103 from gustavo-marques/gme_31May2019 - NOAA-GFDL/MOM6@22b6695 Remove trailing space - NOAA-GFDL/MOM6@a995acf Reverts biharmonic constants to the origial definition - NOAA-GFDL/MOM6@2d2f83f Changes the way of counting the work - NOAA-GFDL/MOM6@25ea4dc Changes in MEKE - NOAA-GFDL/MOM6@f74be3f Deletes code related to GME_Varmix - NOAA-GFDL/MOM6@f52375b Changes logic of an if statement in calc_slope_functions to avoid change in answers - NOAA-GFDL/MOM6@b3c0b69 Fixes unregistered diagnostic id - NOAA-GFDL/MOM6@1388ce7 Removes trailing space - NOAA-GFDL/MOM6@4dd50c1 Fixes additional doxygen syntax - NOAA-GFDL/MOM6@3d997ee Fixes doxygen syntax - NOAA-GFDL/MOM6@35eccc0 Ensures that MEKE%Kh_diff is only used when USE_KH_IN_MEKE = True - NOAA-GFDL/MOM6@3594d53 Merge branch 'merge_GME_17May2019' into geometric_putao - NOAA-GFDL/MOM6@59944eb Added GEOMETRIC as an option for MEKE. Also added biharmonic MEKE viscosity and the option to use a non-MEKE thickness diffusivity to diffuse MEKE. Split MEKE viscosity options into parts concerning Ku and Au. - NOAA-GFDL/MOM6@03386c0 Merge branch 'dev/ncar' into merge_GME - NOAA-GFDL/MOM6@e5a0b82 Merge branch 'GME_10may2019putao' into geometric_putao - NOAA-GFDL/MOM6@e0a8b9b Merge pull request #102 from NCAR/ocn_lag - NOAA-GFDL/MOM6@b2ff365 fix ocean lag logic for restart runs - NOAA-GFDL/MOM6@8797615 Merge pull request #101 from NCAR/ocn_lag - NOAA-GFDL/MOM6@0ae751e apply ocean lag to cesm runs only - NOAA-GFDL/MOM6@eb301fe skip first tstep and double second tstep - NOAA-GFDL/MOM6@b668abf Merge pull request #100 from gustavo-marques/set_fw_bug_to_false - NOAA-GFDL/MOM6@d449d37 Set default of USE_NET_FW_ADJUSTMENT_SIGN_BUG to false in NUOPC cap - NOAA-GFDL/MOM6@eda43c4 Merge branch 'guillermo_putao' into gme_06may2019 - NOAA-GFDL/MOM6@4c15159 Added a "next-to_boundary" mask that should help with fixing abnormally large values of the velocity gradient tensor magnitude next to land. - NOAA-GFDL/MOM6@434ffe7 Working configuration of MEKE/GME. Has biharmonic MEKE viscosity and a GME sink term. - NOAA-GFDL/MOM6@b503858 Merge pull request #99 from gustavo-marques/add_missing_fluxes_nuopc - NOAA-GFDL/MOM6@ef0abe6 Merge branch 'dev/ncar' into gme_03may2019 - NOAA-GFDL/MOM6@434ff08 Willy was silly. - NOAA-GFDL/MOM6@27bc6b3 Merge pull request #98 from NCAR/fix_nuopc_calendar - NOAA-GFDL/MOM6@4b6ef52 Revert "Added biharmonic option for MEKE viscosity." - NOAA-GFDL/MOM6@7671d31 get calendar from CESM - NOAA-GFDL/MOM6@69c21ea Add missing US entries and fix typos introduced during merge - NOAA-GFDL/MOM6@4db5f4d Merge branch 'add_missing_fluxes_nuopc' into gme_03may2019 - NOAA-GFDL/MOM6@4d02387 Add seaice_melt and seaice_melt_heat - NOAA-GFDL/MOM6@a6cd3fe Commented out thickness diffusivity calls for GME, since it is not presently being used. - NOAA-GFDL/MOM6@80c65c7 Added a GME sink term to the MEKE budget. Cleaned up MOM_hor_visc.F90. - NOAA-GFDL/MOM6@6b32174 Added biharmonic option for MEKE viscosity. - NOAA-GFDL/MOM6@73e89ec Cleaned up MOM_hor_visc.F90 a bit, especially parts having to do with calculating FrictWork. - NOAA-GFDL/MOM6@3c91971 Added option to calculate MKE-to-MEKE energy conversion by GME. - NOAA-GFDL/MOM6@f6d1c65 Fixed if statement in MOM_MEKE.F90. Added option to use alternative form of GM PE-to_MEKE energy conversion in MOM_thickness_diffuse. - NOAA-GFDL/MOM6@c24bfb3 Added Jansen et al. (2015) version of MEKE dissipation. Added an alternative way of calculating PE-to_MEKE energy conversion. - NOAA-GFDL/MOM6@3df6ff3 Merge pull request #97 from alperaltuntas/fix_nuopc_use_only - NOAA-GFDL/MOM6@0fcc576 use ESMF operators - NOAA-GFDL/MOM6@36ba339 Merge pull request #96 from gustavo-marques/add_missing_US_arguments_nuopc_cap - NOAA-GFDL/MOM6@ce5571f Add CS%US argument lost during merge conflict - NOAA-GFDL/MOM6@4727f20 Merge branch 'dev-master-candidate-2018-04-22' into add_missing_US_arguments_nuopc_cap - NOAA-GFDL/MOM6@42582a1 Merge pull request #95 from alperaltuntas/fix_debug_mode - NOAA-GFDL/MOM6@03a5586 Merge branch 'dev/ncar' into fix_debug_mode - NOAA-GFDL/MOM6@d8b7825 fix uninitialized oneOrTwo - NOAA-GFDL/MOM6@379e9ee make uppercase DEBUG lowercase - NOAA-GFDL/MOM6@acb4d3f Merge pull request #94 from gustavo-marques/merge-dev-master-candidate-2018-04-22 - NOAA-GFDL/MOM6@d892664 Merge branch 'dev-master-candidate-2018-04-22' into merge-dev-master-candidate-2018-04-22 - NOAA-GFDL/MOM6@5868144 Merge pull request #93 from gustavo-marques/add_nuopc_cap - NOAA-GFDL/MOM6@172ae02 Fixed problems with FrictWorkMax and FrictWorkDiss in MOM_hor_visc.F. More specifically, I moved the calculation of dudx and dvdy outside of the Leith loop so now it is being calculated with sh_xx. - NOAA-GFDL/MOM6@8df6efd Added a new flag to MOM_lateral_mixing_coeffs called "USE_VISBECK", which calculates the GM coefficient using the Visbeck et al. (1997) formulation. Previously this was being done whenever VarMix was enabled, but I wanted to separate VarMix from this diffusivity call. - NOAA-GFDL/MOM6@e5238f5 Merge branch 'dev/ncar' into add_nuopc_cap - NOAA-GFDL/MOM6@6542122 Added new variable FrictWork_diss to account for the energy dissipated by shear production (excluding the energy diffusion term which can be positive). - NOAA-GFDL/MOM6@2260e70 Fixed some coding mistakes from the last commit. - NOAA-GFDL/MOM6@f5da24d Allocated FrictWorkMax array (forgot last time). - NOAA-GFDL/MOM6@59aad4f Added a loop to ensure MEKE is never less than 0. Added new variable called FrictWorkMax that calculates the maximum frictional work that is allowed by theory. - NOAA-GFDL/MOM6@807072b Refactored MOM_hor_visc. Moved GME out of loops where downgradient viscosity is calculated. Moved calculation of FrictWork ahead of GME so I can separate the work done by downgradient stuff from that of GME. - NOAA-GFDL/MOM6@bd98d83 Increased GME limiter and number of times to pass through smoothing function. - NOAA-GFDL/MOM6@fda0334 Fixed QG Leith halo problem on k=nz level. Also added a tapering function to GME that turns it off in shallow water. - NOAA-GFDL/MOM6@24790c2 Added some pass_vector and pass_var calls - NOAA-GFDL/MOM6@a605c59 Added some pass_vector calls - NOAA-GFDL/MOM6@a271bb9 Changed QG Leith limiter to 2D vort. grad. - NOAA-GFDL/MOM6@823d014 Merge branch 'dev/ncar' into GME_21Feb2019 - NOAA-GFDL/MOM6@bed3fbc Change limiter in the GME_coeff to 1.0e4 - NOAA-GFDL/MOM6@25ff7c8 Merge pull request #92 from gustavo-marques/fix_rotation - NOAA-GFDL/MOM6@8f2080a Merge pull request #91 from gustavo-marques/latent_heat_frozen_fluxes - NOAA-GFDL/MOM6@a160252 Change limiter in the GME_coeff to 1.0e5 - NOAA-GFDL/MOM6@dddf151 Merge branch 'latent_heat_frozen_fluxes' into fix_rotation - NOAA-GFDL/MOM6@e502a97 Fix another line length - NOAA-GFDL/MOM6@12d8856 Merge branch 'latent_heat_frozen_fluxes' into fix_rotation - NOAA-GFDL/MOM6@adfd67e Fix line length - NOAA-GFDL/MOM6@2467749 Merge branch 'dev/ncar' into latent_heat_frozen_fluxes - NOAA-GFDL/MOM6@a5fe8c0 Fix rotations in import and export subroutines - NOAA-GFDL/MOM6@72945e4 Comment lines with index_bounds - NOAA-GFDL/MOM6@1241da8 Add new way of calculating latent heat - NOAA-GFDL/MOM6@b97a787 Fixed problem with updating hq -- hq is now a 2D array - NOAA-GFDL/MOM6@5360863 Changed hq to a 2D array - NOAA-GFDL/MOM6@4b35452 Modified initialization of GME variables - NOAA-GFDL/MOM6@38ac453 Fixed several issues for GME - NOAA-GFDL/MOM6@03b01c4 Merge pull request #89 from gustavo-marques/sync_dev_master_19Dec18 - NOAA-GFDL/MOM6@8228b64 Merge pull request #90 from alperaltuntas/fix_oda - NOAA-GFDL/MOM6@cc7f725 apply oda tracer increments only if da is active - NOAA-GFDL/MOM6@de3a52c Deleted KH_t_GME and allocate arrays via safe_alloc_ptr - NOAA-GFDL/MOM6@581b30d Move inv_PI3 outside of k loop - NOAA-GFDL/MOM6@462dfd8 Change condition for applying Ah_Limit + axes for GME diag. - NOAA-GFDL/MOM6@bef613b Add thickness_diffuse_CSp and Barotropic_CSp as arguments - NOAA-GFDL/MOM6@e8a7386 Move thickness_diffuse_init before initialize_dyn_split_RK2 - NOAA-GFDL/MOM6@d3aaa9d Fix calls to find_eta and calc_Visbeck_coeffs - NOAA-GFDL/MOM6@019ee95 Merge branch 'dev/ncar' into ncar_GME_willy_merged - NOAA-GFDL/MOM6@d5f5d32 Adds GME and smoothing function - NOAA-GFDL/MOM6@a38fc07 Add flags for GME and define necessary arrays - NOAA-GFDL/MOM6@ec68e41 Adds infrastructure to enable GME to access private arrays - NOAA-GFDL/MOM6@60d493a Add option to use QG Leith viscosity as the GM coefficient - NOAA-GFDL/MOM6@81a5771 Compute QG Leith GM coefficient and add some diagnostics - NOAA-GFDL/MOM6@c42b6a4 Add grad_vort_mag_h and grad_vort_mag_q - NOAA-GFDL/MOM6@d96a3fe Defined KH arrays in VarMix to be passed to thickness_diffuse. - NOAA-GFDL/MOM6@f913004 Preparing lateral_coeffs and thickness_diffuse for QG Leith calculations. - NOAA-GFDL/MOM6@52667e9 Changed use_QG_Leith to use_QG_Leith_visc. Removed commented lines from calc_QG_Leith_viscosity. - NOAA-GFDL/MOM6@e0baaea Initialized new arrays for Leith, deleted deprecated ones - NOAA-GFDL/MOM6@3b43efe Refactored the entire Leith section. - NOAA-GFDL/MOM6@f4256fb Adding a limiter via planetary number - NOAA-GFDL/MOM6@5c5533b Rename variables to make names consistent; fix dimens. Biharm Smag - NOAA-GFDL/MOM6@b9d69b7 Fix a bug in an if statement - NOAA-GFDL/MOM6@d069e51 Changed constraint on Leith viscosity. - NOAA-GFDL/MOM6@92e2875 Bounds vort_xy_* in Leith. - NOAA-GFDL/MOM6@d02fd47 Adds option to diagnose div_xx_h and vort_xy_q - NOAA-GFDL/MOM6@da862b3 Change calc_Leith_viscosity to calc_QG_Leith_viscosity - NOAA-GFDL/MOM6@84542af QG Leith code refactoring - NOAA-GFDL/MOM6@cda9edd Deletes unneeded code - NOAA-GFDL/MOM6@7746539 Deletes unecessary code and adds Leith_Kh_* - NOAA-GFDL/MOM6@2becf74 Merge branch 'qg-leith' into ncar_qg_leith - NOAA-GFDL/MOM6@69f2c75 Added stretching term for QG Leith viscosity - NOAA-GFDL/MOM6@f08592f Added independent flag for beta-term in Leith - NOAA-GFDL/MOM6@b39edff Cleaned up left over arrays from moving Leith out of MOM_hor_visc.F90 - NOAA-GFDL/MOM6@c546d3d Replaced calc_vert_vort_mag() with calc_Leith_viscosity() - NOAA-GFDL/MOM6@c59f87e Read Leith parameters in MOM_lateral_coeffs.F90 - NOAA-GFDL/MOM6@7dc2510 Added beta to Leith vorticity magnitude - NOAA-GFDL/MOM6@273745c Moved Leith vorticity magnitude calc into MOM_lateral_mixing_coeffs.F90 - NOAA-GFDL/MOM6@e5d4bdf Consolidated Leith related calculations - NOAA-GFDL/MOM6@fd4faf5 Converted local scalar Vort_mag into local 2d array
adcroft
added a commit
that referenced
this issue
Jul 5, 2019
- NOAA-GFDL/MOM6@27485ef Merge branch 'dev/master' into dev/gfdl - NOAA-GFDL/MOM6@7698afb Merge branch 'gustavo-marques-dev-master-candidate-2019-06-11' into dev/master - NOAA-GFDL/MOM6@5c42192 Removes trailing space - NOAA-GFDL/MOM6@8f96916 Passes optional arg. (BT=CS%barotropic_CSp) in calls to horizontal_viscosity - NOAA-GFDL/MOM6@47886e3 Changes Barotropic to BT in horizontal_viscosity - NOAA-GFDL/MOM6@31dfefd Removes Barotropic and thickness_diffuse from MOM_dynamics_unsplit* - NOAA-GFDL/MOM6@0d1fbff Issue FATAL error if SPLIT=False and USE_GME=True - NOAA-GFDL/MOM6@1a71a55 Remove thickness_diffuse_CS from horizontal_viscosity - NOAA-GFDL/MOM6@2a9d421 Set default AH_VEL_SCALE back to zero - NOAA-GFDL/MOM6@98373e8 Fix hint syntax in MOM_obsolete_param - NOAA-GFDL/MOM6@89168bf move OMP calls below GME and above the K-loop - NOAA-GFDL/MOM6@afb07fb Add MEKE_GEOMETRIC_EPSILON - NOAA-GFDL/MOM6@062e3b0 Obsolete parameter MEKE_VISCOSITY_COEFF - NOAA-GFDL/MOM6@2ada29a Adds MEKE_VISCOSITY_COEFF_AU and MEKE_VISCOSITY_COEFF_KU into the MEKE documentation - NOAA-GFDL/MOM6@31dda12 Merge branch 'dev/master' into dev-master-candidate-2019-06-11 - NOAA-GFDL/MOM6@91d0e26 Merge pull request #103 from gustavo-marques/gme_31May2019 - NOAA-GFDL/MOM6@22b6695 Remove trailing space - NOAA-GFDL/MOM6@a995acf Reverts biharmonic constants to the origial definition - NOAA-GFDL/MOM6@2d2f83f Changes the way of counting the work - NOAA-GFDL/MOM6@25ea4dc Changes in MEKE - NOAA-GFDL/MOM6@f74be3f Deletes code related to GME_Varmix - NOAA-GFDL/MOM6@f52375b Changes logic of an if statement in calc_slope_functions to avoid change in answers - NOAA-GFDL/MOM6@b3c0b69 Fixes unregistered diagnostic id - NOAA-GFDL/MOM6@1388ce7 Removes trailing space - NOAA-GFDL/MOM6@4dd50c1 Fixes additional doxygen syntax - NOAA-GFDL/MOM6@3d997ee Fixes doxygen syntax - NOAA-GFDL/MOM6@35eccc0 Ensures that MEKE%Kh_diff is only used when USE_KH_IN_MEKE = True - NOAA-GFDL/MOM6@3594d53 Merge branch 'merge_GME_17May2019' into geometric_putao - NOAA-GFDL/MOM6@59944eb Added GEOMETRIC as an option for MEKE. Also added biharmonic MEKE viscosity and the option to use a non-MEKE thickness diffusivity to diffuse MEKE. Split MEKE viscosity options into parts concerning Ku and Au. - NOAA-GFDL/MOM6@03386c0 Merge branch 'dev/ncar' into merge_GME - NOAA-GFDL/MOM6@e5a0b82 Merge branch 'GME_10may2019putao' into geometric_putao - NOAA-GFDL/MOM6@e0a8b9b Merge pull request #102 from NCAR/ocn_lag - NOAA-GFDL/MOM6@b2ff365 fix ocean lag logic for restart runs - NOAA-GFDL/MOM6@8797615 Merge pull request #101 from NCAR/ocn_lag - NOAA-GFDL/MOM6@0ae751e apply ocean lag to cesm runs only - NOAA-GFDL/MOM6@eb301fe skip first tstep and double second tstep - NOAA-GFDL/MOM6@b668abf Merge pull request #100 from gustavo-marques/set_fw_bug_to_false - NOAA-GFDL/MOM6@d449d37 Set default of USE_NET_FW_ADJUSTMENT_SIGN_BUG to false in NUOPC cap - NOAA-GFDL/MOM6@eda43c4 Merge branch 'guillermo_putao' into gme_06may2019 - NOAA-GFDL/MOM6@4c15159 Added a "next-to_boundary" mask that should help with fixing abnormally large values of the velocity gradient tensor magnitude next to land. - NOAA-GFDL/MOM6@434ffe7 Working configuration of MEKE/GME. Has biharmonic MEKE viscosity and a GME sink term. - NOAA-GFDL/MOM6@b503858 Merge pull request #99 from gustavo-marques/add_missing_fluxes_nuopc - NOAA-GFDL/MOM6@ef0abe6 Merge branch 'dev/ncar' into gme_03may2019 - NOAA-GFDL/MOM6@434ff08 Willy was silly. - NOAA-GFDL/MOM6@27bc6b3 Merge pull request #98 from NCAR/fix_nuopc_calendar - NOAA-GFDL/MOM6@4b6ef52 Revert "Added biharmonic option for MEKE viscosity." - NOAA-GFDL/MOM6@7671d31 get calendar from CESM - NOAA-GFDL/MOM6@69c21ea Add missing US entries and fix typos introduced during merge - NOAA-GFDL/MOM6@4db5f4d Merge branch 'add_missing_fluxes_nuopc' into gme_03may2019 - NOAA-GFDL/MOM6@4d02387 Add seaice_melt and seaice_melt_heat - NOAA-GFDL/MOM6@a6cd3fe Commented out thickness diffusivity calls for GME, since it is not presently being used. - NOAA-GFDL/MOM6@80c65c7 Added a GME sink term to the MEKE budget. Cleaned up MOM_hor_visc.F90. - NOAA-GFDL/MOM6@6b32174 Added biharmonic option for MEKE viscosity. - NOAA-GFDL/MOM6@73e89ec Cleaned up MOM_hor_visc.F90 a bit, especially parts having to do with calculating FrictWork. - NOAA-GFDL/MOM6@3c91971 Added option to calculate MKE-to-MEKE energy conversion by GME. - NOAA-GFDL/MOM6@f6d1c65 Fixed if statement in MOM_MEKE.F90. Added option to use alternative form of GM PE-to_MEKE energy conversion in MOM_thickness_diffuse. - NOAA-GFDL/MOM6@c24bfb3 Added Jansen et al. (2015) version of MEKE dissipation. Added an alternative way of calculating PE-to_MEKE energy conversion. - NOAA-GFDL/MOM6@3df6ff3 Merge pull request #97 from alperaltuntas/fix_nuopc_use_only - NOAA-GFDL/MOM6@0fcc576 use ESMF operators - NOAA-GFDL/MOM6@36ba339 Merge pull request #96 from gustavo-marques/add_missing_US_arguments_nuopc_cap - NOAA-GFDL/MOM6@ce5571f Add CS%US argument lost during merge conflict - NOAA-GFDL/MOM6@4727f20 Merge branch 'dev-master-candidate-2018-04-22' into add_missing_US_arguments_nuopc_cap - NOAA-GFDL/MOM6@42582a1 Merge pull request #95 from alperaltuntas/fix_debug_mode - NOAA-GFDL/MOM6@03a5586 Merge branch 'dev/ncar' into fix_debug_mode - NOAA-GFDL/MOM6@d8b7825 fix uninitialized oneOrTwo - NOAA-GFDL/MOM6@379e9ee make uppercase DEBUG lowercase - NOAA-GFDL/MOM6@acb4d3f Merge pull request #94 from gustavo-marques/merge-dev-master-candidate-2018-04-22 - NOAA-GFDL/MOM6@d892664 Merge branch 'dev-master-candidate-2018-04-22' into merge-dev-master-candidate-2018-04-22 - NOAA-GFDL/MOM6@5868144 Merge pull request #93 from gustavo-marques/add_nuopc_cap - NOAA-GFDL/MOM6@172ae02 Fixed problems with FrictWorkMax and FrictWorkDiss in MOM_hor_visc.F. More specifically, I moved the calculation of dudx and dvdy outside of the Leith loop so now it is being calculated with sh_xx. - NOAA-GFDL/MOM6@8df6efd Added a new flag to MOM_lateral_mixing_coeffs called "USE_VISBECK", which calculates the GM coefficient using the Visbeck et al. (1997) formulation. Previously this was being done whenever VarMix was enabled, but I wanted to separate VarMix from this diffusivity call. - NOAA-GFDL/MOM6@e5238f5 Merge branch 'dev/ncar' into add_nuopc_cap - NOAA-GFDL/MOM6@6542122 Added new variable FrictWork_diss to account for the energy dissipated by shear production (excluding the energy diffusion term which can be positive). - NOAA-GFDL/MOM6@2260e70 Fixed some coding mistakes from the last commit. - NOAA-GFDL/MOM6@f5da24d Allocated FrictWorkMax array (forgot last time). - NOAA-GFDL/MOM6@59aad4f Added a loop to ensure MEKE is never less than 0. Added new variable called FrictWorkMax that calculates the maximum frictional work that is allowed by theory. - NOAA-GFDL/MOM6@807072b Refactored MOM_hor_visc. Moved GME out of loops where downgradient viscosity is calculated. Moved calculation of FrictWork ahead of GME so I can separate the work done by downgradient stuff from that of GME. - NOAA-GFDL/MOM6@bd98d83 Increased GME limiter and number of times to pass through smoothing function. - NOAA-GFDL/MOM6@fda0334 Fixed QG Leith halo problem on k=nz level. Also added a tapering function to GME that turns it off in shallow water. - NOAA-GFDL/MOM6@24790c2 Added some pass_vector and pass_var calls - NOAA-GFDL/MOM6@a605c59 Added some pass_vector calls - NOAA-GFDL/MOM6@a271bb9 Changed QG Leith limiter to 2D vort. grad. - NOAA-GFDL/MOM6@823d014 Merge branch 'dev/ncar' into GME_21Feb2019 - NOAA-GFDL/MOM6@bed3fbc Change limiter in the GME_coeff to 1.0e4 - NOAA-GFDL/MOM6@25ff7c8 Merge pull request #92 from gustavo-marques/fix_rotation - NOAA-GFDL/MOM6@8f2080a Merge pull request #91 from gustavo-marques/latent_heat_frozen_fluxes - NOAA-GFDL/MOM6@a160252 Change limiter in the GME_coeff to 1.0e5 - NOAA-GFDL/MOM6@dddf151 Merge branch 'latent_heat_frozen_fluxes' into fix_rotation - NOAA-GFDL/MOM6@e502a97 Fix another line length - NOAA-GFDL/MOM6@12d8856 Merge branch 'latent_heat_frozen_fluxes' into fix_rotation - NOAA-GFDL/MOM6@adfd67e Fix line length - NOAA-GFDL/MOM6@2467749 Merge branch 'dev/ncar' into latent_heat_frozen_fluxes - NOAA-GFDL/MOM6@a5fe8c0 Fix rotations in import and export subroutines - NOAA-GFDL/MOM6@72945e4 Comment lines with index_bounds - NOAA-GFDL/MOM6@1241da8 Add new way of calculating latent heat - NOAA-GFDL/MOM6@b97a787 Fixed problem with updating hq -- hq is now a 2D array - NOAA-GFDL/MOM6@5360863 Changed hq to a 2D array - NOAA-GFDL/MOM6@4b35452 Modified initialization of GME variables - NOAA-GFDL/MOM6@38ac453 Fixed several issues for GME - NOAA-GFDL/MOM6@03b01c4 Merge pull request #89 from gustavo-marques/sync_dev_master_19Dec18 - NOAA-GFDL/MOM6@8228b64 Merge pull request #90 from alperaltuntas/fix_oda - NOAA-GFDL/MOM6@cc7f725 apply oda tracer increments only if da is active - NOAA-GFDL/MOM6@de3a52c Deleted KH_t_GME and allocate arrays via safe_alloc_ptr - NOAA-GFDL/MOM6@581b30d Move inv_PI3 outside of k loop - NOAA-GFDL/MOM6@462dfd8 Change condition for applying Ah_Limit + axes for GME diag. - NOAA-GFDL/MOM6@bef613b Add thickness_diffuse_CSp and Barotropic_CSp as arguments - NOAA-GFDL/MOM6@e8a7386 Move thickness_diffuse_init before initialize_dyn_split_RK2 - NOAA-GFDL/MOM6@d3aaa9d Fix calls to find_eta and calc_Visbeck_coeffs - NOAA-GFDL/MOM6@019ee95 Merge branch 'dev/ncar' into ncar_GME_willy_merged - NOAA-GFDL/MOM6@d5f5d32 Adds GME and smoothing function - NOAA-GFDL/MOM6@a38fc07 Add flags for GME and define necessary arrays - NOAA-GFDL/MOM6@ec68e41 Adds infrastructure to enable GME to access private arrays - NOAA-GFDL/MOM6@60d493a Add option to use QG Leith viscosity as the GM coefficient - NOAA-GFDL/MOM6@81a5771 Compute QG Leith GM coefficient and add some diagnostics - NOAA-GFDL/MOM6@c42b6a4 Add grad_vort_mag_h and grad_vort_mag_q - NOAA-GFDL/MOM6@d96a3fe Defined KH arrays in VarMix to be passed to thickness_diffuse. - NOAA-GFDL/MOM6@f913004 Preparing lateral_coeffs and thickness_diffuse for QG Leith calculations. - NOAA-GFDL/MOM6@52667e9 Changed use_QG_Leith to use_QG_Leith_visc. Removed commented lines from calc_QG_Leith_viscosity. - NOAA-GFDL/MOM6@e0baaea Initialized new arrays for Leith, deleted deprecated ones - NOAA-GFDL/MOM6@3b43efe Refactored the entire Leith section. - NOAA-GFDL/MOM6@f4256fb Adding a limiter via planetary number - NOAA-GFDL/MOM6@5c5533b Rename variables to make names consistent; fix dimens. Biharm Smag - NOAA-GFDL/MOM6@b9d69b7 Fix a bug in an if statement - NOAA-GFDL/MOM6@d069e51 Changed constraint on Leith viscosity. - NOAA-GFDL/MOM6@92e2875 Bounds vort_xy_* in Leith. - NOAA-GFDL/MOM6@d02fd47 Adds option to diagnose div_xx_h and vort_xy_q - NOAA-GFDL/MOM6@da862b3 Change calc_Leith_viscosity to calc_QG_Leith_viscosity - NOAA-GFDL/MOM6@84542af QG Leith code refactoring - NOAA-GFDL/MOM6@cda9edd Deletes unneeded code - NOAA-GFDL/MOM6@7746539 Deletes unecessary code and adds Leith_Kh_* - NOAA-GFDL/MOM6@2becf74 Merge branch 'qg-leith' into ncar_qg_leith - NOAA-GFDL/MOM6@69f2c75 Added stretching term for QG Leith viscosity - NOAA-GFDL/MOM6@f08592f Added independent flag for beta-term in Leith - NOAA-GFDL/MOM6@b39edff Cleaned up left over arrays from moving Leith out of MOM_hor_visc.F90 - NOAA-GFDL/MOM6@c546d3d Replaced calc_vert_vort_mag() with calc_Leith_viscosity() - NOAA-GFDL/MOM6@c59f87e Read Leith parameters in MOM_lateral_coeffs.F90 - NOAA-GFDL/MOM6@7dc2510 Added beta to Leith vorticity magnitude - NOAA-GFDL/MOM6@273745c Moved Leith vorticity magnitude calc into MOM_lateral_mixing_coeffs.F90 - NOAA-GFDL/MOM6@e5d4bdf Consolidated Leith related calculations - NOAA-GFDL/MOM6@fd4faf5 Converted local scalar Vort_mag into local 2d array
Hallberg-NOAA
added a commit
that referenced
this issue
Apr 19, 2022
Updated the version of MOM6 that MOM6-examples points to, and updated the available_diags files to reflect the changes in MOM6. Also updated other MOM_parameter_doc files in infrequently run test cases that previous changes had altered but which were not updated when the corresponding code changes were introduced. All answers are bitwise identical. The MOM6 commits that are included in this update are: - NOAA-GFDL/MOM6@684878ee4 Add a deta_dt diagnostic to the split BT/BC mode (#99) - NOAA-GFDL/MOM6@b4b7368d5 Merge pull request #111 from marshallward/field_size_fixes - NOAA-GFDL/MOM6@54b8ff50b Merge branch 'dev/gfdl' into field_size_fixes - NOAA-GFDL/MOM6@f6fc6ce17 FMS2: get_field_sizes with FMS1 emulation - NOAA-GFDL/MOM6@f54338ad1 Fix non-standard white space (#109) - NOAA-GFDL/MOM6@d729c679a +Remove append_substring - NOAA-GFDL/MOM6@d8bc9639e Removal of non-standard extensions - NOAA-GFDL/MOM6@7a147ad41 +Document or eliminate undocumented interfaces - NOAA-GFDL/MOM6@e9fdf5de3 Standardized syntax in mask2d logical tests - NOAA-GFDL/MOM6@7f6dac283 Merge pull request #105 from marshallward/pedantic - NOAA-GFDL/MOM6@d3d0c8ecc Merge branch 'dev/gfdl' into pedantic - NOAA-GFDL/MOM6@c150f37a1 Correct --with-driver args for coupled tests (#106) - NOAA-GFDL/MOM6@6809ee3a4 Fix tides_CS attribute in unsplit mode (#103) - NOAA-GFDL/MOM6@d2fb2d0ed MOM_random: Set mask with bits rather than integer - NOAA-GFDL/MOM6@a5350219b Mixed layer restrat statement function refactor - NOAA-GFDL/MOM6@936b11fb6 Format string fixes; function index reorder
marshallward
added a commit
that referenced
this issue
Jul 7, 2022
- NOAA-GFDL/MOM6@3b80e443d Follow MOM6 code style guide - NOAA-GFDL/MOM6@0c1e89a2c Add missing units - NOAA-GFDL/MOM6@0e8acd90b +(*)Fix a scaling bug in MOM_horizontal_regridding - NOAA-GFDL/MOM6@005c46066 Impose standard indentation in nuopc_cap code - NOAA-GFDL/MOM6@3b05cdfdb Impose standard indentation in most driver code - NOAA-GFDL/MOM6@9b1d382ae Style compliance in external/ODA_hooks code - NOAA-GFDL/MOM6@1d8fb5091 +Style compliance in external/drifters code - NOAA-GFDL/MOM6@84d78a661 +Revised stochastics code for style compliance - NOAA-GFDL/MOM6@8f97b3d2f Corrections to cell-averaged density computation (#213) - NOAA-GFDL/MOM6@41a278b81 Candidate branch main->dev/gfdl - NOAA-GFDL/MOM6@e73c231fb +Set thickness_units for use by deta_dt diagnostic - NOAA-GFDL/MOM6@2cd228fbe Adds conditional for setting fluxes%heat_content_* - NOAA-GFDL/MOM6@fc3ab450b Avoid rotating arrays that are not associated - NOAA-GFDL/MOM6@f81414708 Add missing logical to control allocation of fluxes - NOAA-GFDL/MOM6@b9b67a838 Changes needed for when enthalpy is via coupler - NOAA-GFDL/MOM6@fc05abe21 Modifications needed for when enthalpy is via CPL - NOAA-GFDL/MOM6@7924fbaee Modify log/description of ENTHALPY_FROM_COUPLER - NOAA-GFDL/MOM6@b7665f481 Heat conservation when enthalpy is via coupler - NOAA-GFDL/MOM6@72daf7b0c Add option to receive enthalpy fluxes via coupler - NOAA-GFDL/MOM6@861a8f14d Use ODA_2018_ANSWERS to specify ODA remapping - NOAA-GFDL/MOM6@48ae48ae7 Remove unused variables - NOAA-GFDL/MOM6@684878ee4 Add a deta_dt diagnostic to the split BT/BC mode (#99) - NOAA-GFDL/MOM6@f6fc6ce17 FMS2: get_field_sizes with FMS1 emulation - NOAA-GFDL/MOM6@f54338ad1 Fix non-standard white space (#109) - NOAA-GFDL/MOM6@d729c679a +Remove append_substring - NOAA-GFDL/MOM6@d8bc9639e Removal of non-standard extensions - NOAA-GFDL/MOM6@7a147ad41 +Document or eliminate undocumented interfaces - NOAA-GFDL/MOM6@e9fdf5de3 Standardized syntax in mask2d logical tests - NOAA-GFDL/MOM6@c150f37a1 Correct --with-driver args for coupled tests (#106) - NOAA-GFDL/MOM6@6809ee3a4 Fix tides_CS attribute in unsplit mode (#103) - NOAA-GFDL/MOM6@28ff86e4e +Convective adjustment outside regridding_main - NOAA-GFDL/MOM6@fd2060cda +Add Hybgen regridding - NOAA-GFDL/MOM6@138396107 It would be good to initialize CS%answers_2018. - NOAA-GFDL/MOM6@8d92579b2 Deleted an unused function, made public OBC funcs. - NOAA-GFDL/MOM6@9c22ff272 Taking out some unused OBC constants. - NOAA-GFDL/MOM6@3c7bd19ee More cleaning up for issue #54 - NOAA-GFDL/MOM6@d2fb2d0ed MOM_random: Set mask with bits rather than integer - NOAA-GFDL/MOM6@a5350219b Mixed layer restrat statement function refactor - NOAA-GFDL/MOM6@936b11fb6 Format string fixes; function index reorder - NOAA-GFDL/MOM6@4b218c07a Tweaks in response to Hallberg's comments. - NOAA-GFDL/MOM6@57a1a8ae2 Rest of fix for issue #54. - NOAA-GFDL/MOM6@41757c7a5 Fix the rebase - NOAA-GFDL/MOM6@f50551ce4 Fix to Z_RESCALE bug in ePBL. - NOAA-GFDL/MOM6@1e6924e03 More fixes for issue #54. - NOAA-GFDL/MOM6@24f412d77 Part of the fix for issue #54. - NOAA-GFDL/MOM6@6f48b9d1d Oops, more cleanup. - NOAA-GFDL/MOM6@1853352a6 correction on type in directory name - NOAA-GFDL/MOM6@28003a8f7 Adding in that SAL commit again. - NOAA-GFDL/MOM6@4a9162839 Undoing some patches from others - NOAA-GFDL/MOM6@11fa11406 Done with EPBL docs? - NOAA-GFDL/MOM6@918742bbb Working on boundary layer docs. - NOAA-GFDL/MOM6@a180d3316 return a more accurate error message in MOM_stochasics - NOAA-GFDL/MOM6@1428a36ac Several little things, one is making sponge less verbose. - NOAA-GFDL/MOM6@aac6b75dd update to gfdl 20210806 (#74) - NOAA-GFDL/MOM6@71f7354d9 add comments - NOAA-GFDL/MOM6@8775c6d41 revert logic wrt increments - NOAA-GFDL/MOM6@64e83b7aa add logic to remove incrments from restart if outside IAU window - NOAA-GFDL/MOM6@3e573eb11 add write_stoch_restart_ocn to MOM_stochastics - NOAA-GFDL/MOM6@8382652d5 doxygen cleanup - NOAA-GFDL/MOM6@97bbdbf6f move stochastics to external directory - NOAA-GFDL/MOM6@199126eb7 stochastic physics re-write - NOAA-GFDL/MOM6@0932b9ec1 remove debug statements - NOAA-GFDL/MOM6@ebe9d1f6f remove PE_here from mom_ocean_model_nuopc.F90 - NOAA-GFDL/MOM6@077413af9 clean up of mom_ocean_model_nuopc.F90 - NOAA-GFDL/MOM6@b12c09cbb revert MOM_domains.F90 - NOAA-GFDL/MOM6@80fdfb4e8 remove stochastics container - NOAA-GFDL/MOM6@65e0e71bb clean up of code for MOM6 coding standards - NOAA-GFDL/MOM6@121ce71b3 correct coupled_driver/ocean_model_MOM.F90 and other cleanup - NOAA-GFDL/MOM6@045d5c2db make stochastics optional - NOAA-GFDL/MOM6@f874d1113 clean up MOM_domains - NOAA-GFDL/MOM6@390fee8d0 re-write of stochastic code to remove CPP directives - NOAA-GFDL/MOM6@48354da37 fix non stochastic ePBL calculation - NOAA-GFDL/MOM6@583c6ae1e clean up code - NOAA-GFDL/MOM6@878543d22 clean up debug statements - NOAA-GFDL/MOM6@095c36ca4 additions for stochy restarts - NOAA-GFDL/MOM6@6ff36ec6d add stochy_restart writing to mom_cap - NOAA-GFDL/MOM6@cefdb81ed Update MOM_diabatic_driver.F90 - NOAA-GFDL/MOM6@2f5d83d3c Update MOM_diabatic_driver.F90 - NOAA-GFDL/MOM6@b6ac287b6 Update MOM_diabatic_driver.F90 - NOAA-GFDL/MOM6@45acf37f1 cleanup of code and enhancement of ePBL perts - NOAA-GFDL/MOM6@e853f839b additions for stochastic physics and ePBL perts - NOAA-GFDL/MOM6@78c574be1 Add missing h_neglect (#98) - NOAA-GFDL/MOM6@edd3f9c68 +Corrected units in dumbbell get_param calls - NOAA-GFDL/MOM6@db59e142d MOM_neutral_diffusion code cleanup - NOAA-GFDL/MOM6@063ef75fa Minor get_param call reformatting - NOAA-GFDL/MOM6@6bfd073b2 +Avoid nonsensical units descriptions - NOAA-GFDL/MOM6@c626cc464 MOM_internal_tides diagnostic code simplification - NOAA-GFDL/MOM6@305f74473 Rescale new_depth in apply_topography_edits_from_file - NOAA-GFDL/MOM6@39206d91b Simplify diagnostics using global_area_integral - NOAA-GFDL/MOM6@a6992a9d6 Convert global_area_mean diagnostics when writing - NOAA-GFDL/MOM6@9c4363ed2 +Add optional conversion argument to register_diag_scalar - NOAA-GFDL/MOM6@356671c20 +Refactor writing the vertical_coordinate file - NOAA-GFDL/MOM6@08582eead add residual loss term for internal tides (#95) - NOAA-GFDL/MOM6@4c5e98e1b Error handler support - NOAA-GFDL/MOM6@2ac64b39c Set INPUT_STR_LENGTH to 1024 - NOAA-GFDL/MOM6@4e94c5d6a Reduce the populate_param_data memory footprint - NOAA-GFDL/MOM6@3b5d2641a Support arbitrarily long parameter spec lines - NOAA-GFDL/MOM6@97331e705 +Better multi-line parameter specification handling - NOAA-GFDL/MOM6@8bf9abbad reworked algebra corner spread, rotation parenthesis (#90) - NOAA-GFDL/MOM6@ce22d7aea add missing shared variable - NOAA-GFDL/MOM6@115d71477 Ice dynamics (#80) - NOAA-GFDL/MOM6@7c3f31bd4 +(*)Write unscaled MOM6 restart files - NOAA-GFDL/MOM6@11d03b13b +Add unit conversion capability for restarts - NOAA-GFDL/MOM6@966d50f15 (*)Minor MOM_hor_visc code cleanup - NOAA-GFDL/MOM6@ab4d226bb +(*)MOM_hor_visc bug fix and loop size cleanup - NOAA-GFDL/MOM6@8c6ae0eea Corrected the license on RGC_initialization.F90 - NOAA-GFDL/MOM6@a002923ae (*)Fix rescaling in RGC_initialize_sponges - NOAA-GFDL/MOM6@14a28f477 Avoid copying the tracer registry in advect_tracer - NOAA-GFDL/MOM6@5a8590b03 +Add Laplacian diffusion of interface heights - NOAA-GFDL/MOM6@406bc59cd Merge remote-tracking branch 'alexandra/main' into dev/esmg - NOAA-GFDL/MOM6@9c341f06e Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/MOM6@3675c2169 +Add Hybgen remapping options - NOAA-GFDL/MOM6@304294260 Fix nolibs build in CI pipeline - NOAA-GFDL/MOM6@d5601696e +Stop logging NEW_SPONGES - NOAA-GFDL/MOM6@6963b222d Add KPP nonlocal term to passive tracers (#202) - NOAA-GFDL/MOM6@efa503bd2 bugfix: static h_new shape remaining_transport_sum - NOAA-GFDL/MOM6@b4a67c1ad Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/MOM6@464046138 (*)Avoid negative thicknesses in mixed_layer_restrat - NOAA-GFDL/MOM6@9a01cd501 +Add ALE options mimicking Hycom - NOAA-GFDL/MOM6@9caa7010f (+) Refactor of MOM_file_parser - NOAA-GFDL/MOM6@fa2832c11 +(*)Rescale variables with homogenize_forcing - NOAA-GFDL/MOM6@b3e80f73f +(*)Add tmp_scale arguments to global_area_mean - NOAA-GFDL/MOM6@a468bee03 Removed trailing white space - NOAA-GFDL/MOM6@a0d02387e (*)+Use reproducing stocks for all tracer packages - NOAA-GFDL/MOM6@1bf82205a (*)+Reproducing tracer stocks - NOAA-GFDL/MOM6@8197cea79 Use global_mass_integral in lateral_bdry_diff - NOAA-GFDL/MOM6@9c7bf292d +Add global_mass_int_EFP - NOAA-GFDL/MOM6@d46dbc775 Report mean temperature from MOM_state_stats() - NOAA-GFDL/MOM6@65b2c8249 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/MOM6@149073fea Remove hard-wired parameter in adjustEtaToFitBathymetry (#69) - NOAA-GFDL/MOM6@32e1ecf45 Fixes issues with the GME code and get_param calls for Leith options (#65) - NOAA-GFDL/MOM6@098f5c9d9 fix u10_sqr dimensional scaling - NOAA-GFDL/MOM6@b39648adc merge with latest main (2020feb17) and resolve conflicts - NOAA-GFDL/MOM6@e84160915 remove unnecessary optional flag - NOAA-GFDL/MOM6@c166358b2 Add optional argument to FMS2 version of get_field_size - NOAA-GFDL/MOM6@fc5253f73 (*)Correct memory declarations in MOM_regridding - NOAA-GFDL/MOM6@035ae5c85 Misc dimensional consistency fixes in regridding, remapping, and MEKE routines - NOAA-GFDL/MOM6@75bf521e2 +Move MOM_scaling_check.F90 to MOM_unique_scales.F90 - NOAA-GFDL/MOM6@56401b637 +Add MOM_check_scaling.F90 and MOM_scaling_check.F90 - NOAA-GFDL/MOM6@c18185422 fix line lenght error in MOM_wave_interface - NOAA-GFDL/MOM6@ebb643af9 Oops, more cleanup. - NOAA-GFDL/MOM6@65cccb7a0 correction on type in directory name - NOAA-GFDL/MOM6@45d615191 Adding in that SAL commit again. - NOAA-GFDL/MOM6@3dbf2f58d Undoing some patches from others - NOAA-GFDL/MOM6@71908c8fd Done with EPBL docs? - NOAA-GFDL/MOM6@b7b4141a6 Working on boundary layer docs. - NOAA-GFDL/MOM6@c3ff425ce return a more accurate error message in MOM_stochasics - NOAA-GFDL/MOM6@348a81b63 Several little things, one is making sponge less verbose. - NOAA-GFDL/MOM6@9221b5d50 update to gfdl 20210806 (#74) - NOAA-GFDL/MOM6@59e733f3e add comments - NOAA-GFDL/MOM6@15e402940 revert logic wrt increments - NOAA-GFDL/MOM6@78b8d7919 add logic to remove incrments from restart if outside IAU window - NOAA-GFDL/MOM6@a5d90655d add write_stoch_restart_ocn to MOM_stochastics - NOAA-GFDL/MOM6@e91c96609 doxygen cleanup - NOAA-GFDL/MOM6@cf1d29628 move stochastics to external directory - NOAA-GFDL/MOM6@493717a35 stochastic physics re-write - NOAA-GFDL/MOM6@a67bc78a2 remove debug statements - NOAA-GFDL/MOM6@e2431bc81 remove PE_here from mom_ocean_model_nuopc.F90 - NOAA-GFDL/MOM6@ea36db238 clean up of mom_ocean_model_nuopc.F90 - NOAA-GFDL/MOM6@4c931094f revert MOM_domains.F90 - NOAA-GFDL/MOM6@c7531a75f remove stochastics container - NOAA-GFDL/MOM6@08dc1a44b clean up of code for MOM6 coding standards - NOAA-GFDL/MOM6@e80d5f57e correct coupled_driver/ocean_model_MOM.F90 and other cleanup - NOAA-GFDL/MOM6@0bf4ff0a1 make stochastics optional - NOAA-GFDL/MOM6@9e7029ca8 clean up MOM_domains - NOAA-GFDL/MOM6@58f1fe98f re-write of stochastic code to remove CPP directives - NOAA-GFDL/MOM6@15dde3622 fix non stochastic ePBL calculation - NOAA-GFDL/MOM6@49111ff9f clean up code - NOAA-GFDL/MOM6@0c48bfc6a clean up debug statements - NOAA-GFDL/MOM6@becb4420e additions for stochy restarts - NOAA-GFDL/MOM6@36ce2d108 add stochy_restart writing to mom_cap - NOAA-GFDL/MOM6@5f6973b4d Update MOM_diabatic_driver.F90 - NOAA-GFDL/MOM6@c48a46ae0 Update MOM_diabatic_driver.F90 - NOAA-GFDL/MOM6@a0e5b56af Update MOM_diabatic_driver.F90 - NOAA-GFDL/MOM6@a534541c5 cleanup of code and enhancement of ePBL perts - NOAA-GFDL/MOM6@0add693a8 additions for stochastic physics and ePBL perts - NOAA-GFDL/MOM6@a00b7799f Merge remote-tracking branch 'NCAR/surfbands_refactor' into BGR_Stokes_DDT_Fixes - NOAA-GFDL/MOM6@dc59b117b Fixing restart issue with Stokes time tendency term. - NOAA-GFDL/MOM6@f89fd1351 Fixing diagnostic mode for vortex force correction term. - NOAA-GFDL/MOM6@58874a5f3 Updates to Stokes drift terms, primarily the pressure gradient routine. - NOAA-GFDL/MOM6@4f592f298 More changes for surfbands wave coupling: - for ustkb and vstkb, call pass_var, instead of pass_vector because they are on h grd. -remove unused ustk0 and vstk0 arrays. - correct the order of wave-related get param & allocate_forcing calls in nuopc cap. - add lamult flag to allocate_forcing_by_group because lamult should only be allocated if wave_method=="EFACTOR". - NOAA-GFDL/MOM6@28268d3e6 fixes in MOM_wave_interface array indices - NOAA-GFDL/MOM6@dc93bdeef Fixes for Stokes time tendency terms - NOAA-GFDL/MOM6@b619d38eb remove duplicate assignments of dvdx and dudy. These duplicate assignments incorrectly override dvdx and dudy when surfbands wave coupling is on. - NOAA-GFDL/MOM6@cb671d2c0 merge with latest dev/ncar and resolve conflicts - NOAA-GFDL/MOM6@d4c36a60a Fix openmp test by adding Stokes_VT to shr clause in MOM_CoriolisAdv. Also remove the Passive_Stokes_VF block since it's never set to true. - NOAA-GFDL/MOM6@e2ab77e99 initialize wave option flags to false - NOAA-GFDL/MOM6@c880a156a For the drivers calling MOM_wave_interface_init, add the optional waves_csp arg to initialize_MOM calls so as to ensure that the waves_csp is allocated. This commit also has several misc doxygen fixes. - NOAA-GFDL/MOM6@e7f628e17 refactoring and changes to write stokes drift profile to restart file when surfbands wave coupling mode is on. - NOAA-GFDL/MOM6@15c3d53de changes in the nuopc cap to support arbitrary stokes bands With these changes, arbitrary number of of partitioned stokes drift components may be imported from ww3 when coupled within cesm. After the planned unification of ww3 nuopc caps of CESM and EMC, the old (fixed) approach may be removed. - NOAA-GFDL/MOM6@eacd9d016 fix doxygen errors in surfbands_refactor branch - NOAA-GFDL/MOM6@a0d1d9982 Do not call get_Langmuir_Number if lamult is already provided via ww3 - NOAA-GFDL/MOM6@b1c341248 enclose stokes vorticity diag computations with Stokes_VF conditional - NOAA-GFDL/MOM6@824039dac enclose stokes vorticity diag computations with Stokes_VF conditional - NOAA-GFDL/MOM6@59a31f62c remove unnecessary ampersands from variable declarations - NOAA-GFDL/MOM6@dcf30ac50 merge pr1507 with dev/ncar and resolve conflicts in MOM_tidal_mixing - NOAA-GFDL/MOM6@6e94b699b disable the register of tidal mixing coeff diags when they are unavailable - NOAA-GFDL/MOM6@e3d190db3 In NUOPC cap, add ability to import fields with ungridded dimensions - NOAA-GFDL/MOM6@380a04090 Merge remote-tracking branch 'breichl/Stokes_Forces' into pstokes_wave_cpl_mehtod - NOAA-GFDL/MOM6@c5f1d442e Updating name of Stokes PGF routine to be more descriptive. - NOAA-GFDL/MOM6@a6de11c92 Remote application of Stokes tendency on thermodynamic step - NOAA-GFDL/MOM6@9fbdf11ec Finish incomplete merge in MOM_wave_interface. - NOAA-GFDL/MOM6@77084ecc9 Adding Stokes forces implementation and diags. SIS2: Replace MOM_memory.h with SIS2_memory.h - NOAA-GFDL/SIS2@55dbb3a Replace MOM_memory.h with SIS2_memory.h - NOAA-GFDL/SIS2@33589c6 Fixed the syntax of new comments in PR #173 - NOAA-GFDL/SIS2@164e404 Getting OBCs with MERGED_CONTINUITY to work - NOAA-GFDL/SIS2@d62188d OBC's for C-grid stress. - NOAA-GFDL/SIS2@c84a83b Start of ice OBCs - it compiles. - NOAA-GFDL/SIS2@2ac240a Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/SIS2@a9884b8 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg - NOAA-GFDL/SIS2@3399a73 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The versions of the submodules
src/FMSandsrc/couplerpointed to in MOM6-examples has been updated (in commit 6737f18).git pulldocd MOM6-examples; git submodule update src/FMS src/coupler.The changes in FMS include various fixes, including a removal of those uncountable "cell methods" warnings. The changes in coupler allow a co-existence between the AM2/3 and AM4 physics - all our tests use AM2 physics at this time.
PS> I should have sent this out a week ago. Thanks for the nudge @kshedstrom .
The text was updated successfully, but these errors were encountered: