Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SIS2: Merge branch 'Hallberg-NOAA-remove_Verona_interfaces' into dev/…
…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
- Loading branch information