Skip to content

Commit

Permalink
+(*)Updated coupler, SIS2 & MOM6 for interspersed ice
Browse files Browse the repository at this point in the history 
  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
  • Loading branch information
@Hallberg-NOAA
Hallberg-NOAA committed Mar 27, 2019
1 parent 78c1690 commit 8859644
Show file tree
Hide file tree
Showing 32 changed files with 9,379 additions and 196 deletions.
24 changes: 21 additions & 3 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
FAST_ICE_RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
! The name of the restart file for those elements of the
! the sea ice that are handled by the fast ice PEs.
APPLY_MASKS_AFTER_RESTART = True ! [Boolean] default = True
! If true, applies masks to mH_ice,mH_snow and part_size after a restart.
WRITE_GEOM = 1 ! default = 1
! If =0, never write the geometry and vertical grid files.
! If =1, write the geometry and vertical grid files only for
Expand Down Expand Up @@ -324,11 +326,24 @@ DT_ICE_DYNAMICS = 3600.0 ! [seconds] default = -1.0
! stepping the continuity equation and interactions
! between the ice mass field and velocities. If 0 or
! negative the coupling time step will be used.
MERGED_CONTINUITY = False ! [Boolean] default = False
! If true, update the continuity equations for the ice, snow,
! and melt pond water together summed across categories, with
! proportionate fluxes for each part. Otherwise the media are
! updated separately.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow dynamics
! time step.
ICEBERG_WINDSTRESS_BUG = False ! [Boolean] default = False
! If true, use older code that applied an old ice-ocean
! stress to the icebergs in place of the current air-ocean
! stress. This option is here for backward compatibility,
! but should be avoided.
WARSAW_SUM_ORDER = True ! [Boolean] default = True
! If true, use the order of sums in the Warsaw version of SIS2.
! The default is the opposite of MERGED_CONTINUITY.
! This option exists for backward compatibilty but may
! eventually be obsoleted.
TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04
! The time unit for ICE_STATS_INTERVAL.
ICE_STATS_INTERVAL = 0.25 ! [days] default = 1.0
Expand Down Expand Up @@ -380,9 +395,6 @@ CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the
! rheology solver; otherwise only the final velocities that
! are used for transport are checked.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow time
! step.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness
! categories after advection.
Expand All @@ -399,6 +411,9 @@ SIS_THICKNESS_ADVECTION_SCHEME = "PCM" ! default = "UPWIND_2D"
! PCM - Directionally split piecewise constant
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
INCONSISTENT_COVER_BUG = True ! [Boolean] default = True
! If true, omit a recalculation of the fractional ice-free
! areal coverage after the adjustment of the ice categories.
SIS_CONTINUITY_SCHEME = "PCM" ! default = "UPWIND_2D"
! The horizontal transport scheme used in continuity:
! UPWIND_2D - Non-directionally split upwind
Expand Down Expand Up @@ -434,6 +449,9 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"
! The file to use to write the globally integrated
! statistics.

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ SIS_TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "UPWIND_2D"

! === module SIS_sum_output ===

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.

Expand Down
24 changes: 21 additions & 3 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
FAST_ICE_RESTARTFILE = "ice_model_fast.res.nc" ! default = "ice_model_fast.res.nc"
! The name of the restart file for those elements of the
! the sea ice that are handled by the fast ice PEs.
APPLY_MASKS_AFTER_RESTART = True ! [Boolean] default = True
! If true, applies masks to mH_ice,mH_snow and part_size after a restart.
WRITE_GEOM = 1 ! default = 1
! If =0, never write the geometry and vertical grid files.
! If =1, write the geometry and vertical grid files only for
Expand Down Expand Up @@ -321,11 +323,24 @@ DT_ICE_DYNAMICS = 3600.0 ! [seconds] default = -1.0
! stepping the continuity equation and interactions
! between the ice mass field and velocities. If 0 or
! negative the coupling time step will be used.
MERGED_CONTINUITY = False ! [Boolean] default = False
! If true, update the continuity equations for the ice, snow,
! and melt pond water together summed across categories, with
! proportionate fluxes for each part. Otherwise the media are
! updated separately.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow dynamics
! time step.
ICEBERG_WINDSTRESS_BUG = False ! [Boolean] default = False
! If true, use older code that applied an old ice-ocean
! stress to the icebergs in place of the current air-ocean
! stress. This option is here for backward compatibility,
! but should be avoided.
WARSAW_SUM_ORDER = True ! [Boolean] default = True
! If true, use the order of sums in the Warsaw version of SIS2.
! The default is the opposite of MERGED_CONTINUITY.
! This option exists for backward compatibilty but may
! eventually be obsoleted.
TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04
! The time unit for ICE_STATS_INTERVAL.
ICE_STATS_INTERVAL = 0.25 ! [days] default = 1.0
Expand Down Expand Up @@ -377,9 +392,6 @@ CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the
! rheology solver; otherwise only the final velocities that
! are used for transport are checked.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow time
! step.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness
! categories after advection.
Expand All @@ -396,6 +408,9 @@ SIS_THICKNESS_ADVECTION_SCHEME = "PCM" ! default = "UPWIND_2D"
! PCM - Directionally split piecewise constant
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
INCONSISTENT_COVER_BUG = True ! [Boolean] default = True
! If true, omit a recalculation of the fractional ice-free
! areal coverage after the adjustment of the ice categories.
SIS_CONTINUITY_SCHEME = "PCM" ! default = "UPWIND_2D"
! The horizontal transport scheme used in continuity:
! UPWIND_2D - Non-directionally split upwind
Expand Down Expand Up @@ -431,6 +446,9 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"
! The file to use to write the globally integrated
! statistics.

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ SIS_TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "UPWIND_2D"

! === module SIS_sum_output ===

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.

Expand Down
24 changes: 21 additions & 3 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
FAST_ICE_RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
! The name of the restart file for those elements of the
! the sea ice that are handled by the fast ice PEs.
APPLY_MASKS_AFTER_RESTART = True ! [Boolean] default = True
! If true, applies masks to mH_ice,mH_snow and part_size after a restart.
WRITE_GEOM = 1 ! default = 1
! If =0, never write the geometry and vertical grid files.
! If =1, write the geometry and vertical grid files only for
Expand Down Expand Up @@ -342,11 +344,24 @@ DT_ICE_DYNAMICS = 3600.0 ! [seconds] default = -1.0
! stepping the continuity equation and interactions
! between the ice mass field and velocities. If 0 or
! negative the coupling time step will be used.
MERGED_CONTINUITY = False ! [Boolean] default = False
! If true, update the continuity equations for the ice, snow,
! and melt pond water together summed across categories, with
! proportionate fluxes for each part. Otherwise the media are
! updated separately.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow dynamics
! time step.
ICEBERG_WINDSTRESS_BUG = False ! [Boolean] default = False
! If true, use older code that applied an old ice-ocean
! stress to the icebergs in place of the current air-ocean
! stress. This option is here for backward compatibility,
! but should be avoided.
WARSAW_SUM_ORDER = True ! [Boolean] default = True
! If true, use the order of sums in the Warsaw version of SIS2.
! The default is the opposite of MERGED_CONTINUITY.
! This option exists for backward compatibilty but may
! eventually be obsoleted.
TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04
! The time unit for ICE_STATS_INTERVAL.
ICE_STATS_INTERVAL = 0.25 ! [days] default = 1.0
Expand Down Expand Up @@ -398,9 +413,6 @@ CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the
! rheology solver; otherwise only the final velocities that
! are used for transport are checked.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow time
! step.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness
! categories after advection.
Expand All @@ -417,6 +429,9 @@ SIS_THICKNESS_ADVECTION_SCHEME = "UPWIND_2D" ! default = "UPWIND_2D"
! PCM - Directionally split piecewise constant
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
INCONSISTENT_COVER_BUG = True ! [Boolean] default = True
! If true, omit a recalculation of the fractional ice-free
! areal coverage after the adjustment of the ice categories.
SIS_CONTINUITY_SCHEME = "UPWIND_2D" ! default = "UPWIND_2D"
! The horizontal transport scheme used in continuity:
! UPWIND_2D - Non-directionally split upwind
Expand Down Expand Up @@ -452,6 +467,9 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"
! The file to use to write the globally integrated
! statistics.

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ SIS_TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "UPWIND_2D"

! === module SIS_sum_output ===

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.

Expand Down
24 changes: 21 additions & 3 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
FAST_ICE_RESTARTFILE = "ice_model.res.nc" ! default = "ice_model.res.nc"
! The name of the restart file for those elements of the
! the sea ice that are handled by the fast ice PEs.
APPLY_MASKS_AFTER_RESTART = True ! [Boolean] default = True
! If true, applies masks to mH_ice,mH_snow and part_size after a restart.
WRITE_GEOM = 1 ! default = 1
! If =0, never write the geometry and vertical grid files.
! If =1, write the geometry and vertical grid files only for
Expand Down Expand Up @@ -324,11 +326,24 @@ DT_ICE_DYNAMICS = 3600.0 ! [seconds] default = -1.0
! stepping the continuity equation and interactions
! between the ice mass field and velocities. If 0 or
! negative the coupling time step will be used.
MERGED_CONTINUITY = False ! [Boolean] default = False
! If true, update the continuity equations for the ice, snow,
! and melt pond water together summed across categories, with
! proportionate fluxes for each part. Otherwise the media are
! updated separately.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow dynamics
! time step.
ICEBERG_WINDSTRESS_BUG = False ! [Boolean] default = False
! If true, use older code that applied an old ice-ocean
! stress to the icebergs in place of the current air-ocean
! stress. This option is here for backward compatibility,
! but should be avoided.
WARSAW_SUM_ORDER = True ! [Boolean] default = True
! If true, use the order of sums in the Warsaw version of SIS2.
! The default is the opposite of MERGED_CONTINUITY.
! This option exists for backward compatibilty but may
! eventually be obsoleted.
TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04
! The time unit for ICE_STATS_INTERVAL.
ICE_STATS_INTERVAL = 1.0 ! [days] default = 1.0
Expand Down Expand Up @@ -380,9 +395,6 @@ CFL_TRUNC_DYN_ITS = False ! [Boolean] default = False
! If true, check the CFL number for every iteration of the
! rheology solver; otherwise only the final velocities that
! are used for transport are checked.
NSTEPS_ADV = 1 ! default = 1
! The number of advective iterations for each slow time
! step.
RECATEGORIZE_ICE = True ! [Boolean] default = True
! If true, readjust the distribution into ice thickness
! categories after advection.
Expand All @@ -399,6 +411,9 @@ SIS_THICKNESS_ADVECTION_SCHEME = "UPWIND_2D" ! default = "UPWIND_2D"
! PCM - Directionally split piecewise constant
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
INCONSISTENT_COVER_BUG = True ! [Boolean] default = True
! If true, omit a recalculation of the fractional ice-free
! areal coverage after the adjustment of the ice categories.
SIS_CONTINUITY_SCHEME = "UPWIND_2D" ! default = "UPWIND_2D"
! The horizontal transport scheme used in continuity:
! UPWIND_2D - Non-directionally split upwind
Expand Down Expand Up @@ -434,6 +449,9 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"
! The file to use to write the globally integrated
! statistics.

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ SIS_TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "UPWIND_2D"

! === module SIS_sum_output ===

! === module SIS_ice_diagnostics ===
! This module handles sea-ice state diagnostics.

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.

Expand Down
Loading

0 comments on commit 8859644

Please sign in to comment.