diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all index 726c539404..733d45a1f4 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all @@ -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 @@ -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 @@ -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. @@ -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 @@ -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 diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout index 34241fdbdc..97e58b2bee 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.short index a31b4ebea4..1b29b345ca 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.short @@ -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. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all index 02f4bcadc8..d1edfa4616 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout index 01ab436382..cc4d79ff45 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all index 7cb489b029..fcf62e0e96 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all @@ -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 @@ -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 @@ -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. @@ -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 @@ -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 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout index 2307fc213f..11fbeb8aab 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.short b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.short index a31b4ebea4..1b29b345ca 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.short @@ -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. diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all index ece9e4cfbd..71a3532ef8 100644 --- a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.all @@ -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 @@ -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 @@ -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. @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout index ef639a4d46..b320c31ed1 100644 --- a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.short b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.short index b40f97487e..18a3227e6d 100644 --- a/ice_ocean_SIS2/Baltic/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/SIS_parameter_doc.short @@ -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. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all index 344558a0df..f4ecfb1a35 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all @@ -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 @@ -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 @@ -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. @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout index 8bca685d52..e0b70b69fe 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.short b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.short index a713326a6b..6c4975f56b 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.short @@ -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. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all index 9e8048b091..cf07c7a9ca 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all @@ -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 @@ -324,11 +326,24 @@ DT_ICE_DYNAMICS = 1200.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 @@ -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. @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout index 8383b7ff6c..c191aa69a4 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.short index 2657dbb1e4..05f5eba804 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.short @@ -117,6 +117,9 @@ MAXTRUNC = 200 ! [truncations save_interval-1] default = 0 ! Set MAXTRUNC to 0 to stop if there is any truncation ! of sea ice velocities. +! === 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. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all index fcd9d9ee11..c11b3da597 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all @@ -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 @@ -320,11 +322,24 @@ DT_ICE_DYNAMICS = 1200.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 = True ! [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 @@ -376,9 +391,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. @@ -395,6 +407,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 @@ -430,6 +445,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 diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout index f1a2f84f81..6656d0cde1 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.short index 8555b368e2..ef8a8a9d0a 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.short @@ -126,6 +126,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. diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all index 708a55d631..ff8175307d 100644 --- a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all @@ -92,6 +92,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 @@ -326,11 +328,24 @@ DT_ICE_DYNAMICS = 1200.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 @@ -382,9 +397,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. @@ -401,6 +413,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 @@ -436,6 +451,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 diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout index c88a005ff1..117ff02a2d 100644 --- a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.short b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.short index e9c656ccdc..cfa1ed69c2 100644 --- a/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/SIS_parameter_doc.short @@ -120,6 +120,9 @@ MAXTRUNC = 200 ! [truncations save_interval-1] default = 0 ! Set MAXTRUNC to 0 to stop if there is any truncation ! of sea ice velocities. +! === 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. diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all index b09b8b6663..87ba615c95 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all @@ -92,6 +92,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 @@ -322,11 +324,24 @@ DT_ICE_DYNAMICS = 1200.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 = True ! [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 @@ -378,9 +393,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. @@ -397,6 +409,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 @@ -432,6 +447,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 diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout index 10c44b3f34..6253b1160c 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short index 3b45da09f2..ab65e13ba2 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short @@ -129,6 +129,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. diff --git a/ice_ocean_SIS2/SIS2/SIS.available_diags b/ice_ocean_SIS2/SIS2/SIS.available_diags index c71e16c53d..bbe733dd30 100644 --- a/ice_ocean_SIS2/SIS2/SIS.available_diags +++ b/ice_ocean_SIS2/SIS2/SIS.available_diags @@ -184,6 +184,18 @@ "ice_model", "IY_TRANS" [Used] ! long_name: y-direction ice transport ! units: kg/s +"ice_model", "XPRT" [Used] + ! long_name: frozen water transport convergence + ! units: kg/(m^2*yr) +"ice_model", "RDG_RATE" [Unused] + ! long_name: ice ridging rate + ! units: 1/sec +"ice_model", "FA_X" [Used] + ! long_name: air stress on ice - x component + ! units: Pa +"ice_model", "FA_Y" [Used] + ! long_name: air stress on ice - y component + ! units: Pa "ice_model", "EXT" [Used] ! long_name: ice modeled ! units: 0 or 1 @@ -250,15 +262,6 @@ "ice_model", "Sal4" [Unused] ! long_name: ice layer 4 salinity ! units: g/kg -"ice_model", "FA_X" [Used] - ! long_name: air stress on ice - x component - ! units: Pa -"ice_model", "FA_Y" [Used] - ! long_name: air stress on ice - y component - ! units: Pa -"ice_model", "XPRT" [Used] - ! long_name: frozen water transport convergence - ! units: kg/(m^2*yr) "ice_model", "MI" [Used] ! long_name: ice + snow mass ! units: kg/m^2 @@ -274,6 +277,3 @@ "ice_model", "E2MELT" [Unused] ! long_name: heat needed to melt ice ! units: J/m^2 -"ice_model", "RDG_RATE" [Unused] - ! long_name: ice ridging rate - ! units: 1/sec diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all index 48498ac00d..64eba8f7d6 100644 --- a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.all @@ -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 @@ -320,11 +322,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 @@ -345,9 +360,6 @@ ICE_CDRAG_WATER = 0.00324 ! [nondim] default = 0.00324 AIR_WATER_STRESS_TURN_ANGLE = 0.0 ! [degrees] default = 0.0 ! An angle by which to rotate the velocities at the air- ! water boundary in calculating stresses. -NSTEPS_ADV = 1 ! default = 1 - ! The number of advective iterations for each slow time - ! step. RECATEGORIZE_ICE = False ! [Boolean] default = True ! If true, readjust the distribution into ice thickness ! categories after advection. @@ -364,6 +376,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 @@ -399,6 +414,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 diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout index 5056ef4ad1..d2c23958bd 100644 --- a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.short b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.short index d7cb7c37aa..1b05d95a00 100644 --- a/ice_ocean_SIS2/SIS2/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/SIS_parameter_doc.short @@ -101,6 +101,9 @@ RECATEGORIZE_ICE = False ! [Boolean] default = True ! === 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. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags index bba9e59f6c..5dfc2b41c7 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags @@ -316,6 +316,18 @@ "ice_model", "IY_TRANS" [Used] ! long_name: y-direction ice transport ! units: kg/s +"ice_model", "XPRT" [Used] + ! long_name: frozen water transport convergence + ! units: kg/(m^2*yr) +"ice_model", "RDG_RATE" [Unused] + ! long_name: ice ridging rate + ! units: 1/sec +"ice_model", "FA_X" [Used] + ! long_name: Air stress on ice on C-grid - x component + ! units: Pa +"ice_model", "FA_Y" [Used] + ! long_name: Air stress on ice on C-grid - y component + ! units: Pa "ice_model", "EXT" [Used] ! long_name: ice modeled ! units: 0 or 1 @@ -382,15 +394,6 @@ "ice_model", "Sal4" [Unused] ! long_name: ice layer 4 salinity ! units: g/kg -"ice_model", "FA_X" [Used] - ! long_name: Air stress on ice on C-grid - x component - ! units: Pa -"ice_model", "FA_Y" [Used] - ! long_name: Air stress on ice on C-grid - y component - ! units: Pa -"ice_model", "XPRT" [Used] - ! long_name: frozen water transport convergence - ! units: kg/(m^2*yr) "ice_model", "MI" [Used] ! long_name: ice + snow mass ! units: kg/m^2 @@ -406,6 +409,3 @@ "ice_model", "E2MELT" [Unused] ! long_name: heat needed to melt ice ! units: J/m^2 -"ice_model", "RDG_RATE" [Unused] - ! long_name: ice ridging rate - ! units: 1/sec diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all index bb064eb67a..2c72bc2d62 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all @@ -92,6 +92,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 @@ -326,11 +328,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 @@ -382,9 +397,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. @@ -401,6 +413,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 @@ -436,6 +451,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 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout index ec124f422a..f7a00ea6c7 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.short index e2a956cc88..0b95b0a0b2 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.short @@ -99,6 +99,9 @@ ICE_TDAMP_ELASTIC = 1000.0 ! [s or nondim] default = -0.2 ! === 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. diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags b/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags index e8357b2dca..4efbe2bd9c 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags @@ -307,6 +307,18 @@ "ice_model", "IY_TRANS" [Used] ! long_name: y-direction ice transport ! units: kg/s +"ice_model", "XPRT" [Used] + ! long_name: frozen water transport convergence + ! units: kg/(m^2*yr) +"ice_model", "RDG_RATE" [Unused] + ! long_name: ice ridging rate + ! units: 1/sec +"ice_model", "FA_X" [Used] + ! long_name: Air stress on ice on C-grid - x component + ! units: Pa +"ice_model", "FA_Y" [Used] + ! long_name: Air stress on ice on C-grid - y component + ! units: Pa "ice_model", "EXT" [Used] ! long_name: ice modeled ! units: 0 or 1 @@ -373,15 +385,6 @@ "ice_model", "Sal4" [Unused] ! long_name: ice layer 4 salinity ! units: g/kg -"ice_model", "FA_X" [Used] - ! long_name: Air stress on ice on C-grid - x component - ! units: Pa -"ice_model", "FA_Y" [Used] - ! long_name: Air stress on ice on C-grid - y component - ! units: Pa -"ice_model", "XPRT" [Used] - ! long_name: frozen water transport convergence - ! units: kg/(m^2*yr) "ice_model", "MI" [Used] ! long_name: ice + snow mass ! units: kg/m^2 @@ -397,6 +400,3 @@ "ice_model", "E2MELT" [Unused] ! long_name: heat needed to melt ice ! units: J/m^2 -"ice_model", "RDG_RATE" [Unused] - ! long_name: ice ridging rate - ! units: 1/sec diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all index cfd72d1197..ec17a222ac 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all @@ -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 @@ -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 @@ -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. @@ -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 @@ -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 diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout index 2307fc213f..11fbeb8aab 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.short index 52160c79bc..f9cb0b3bde 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.short @@ -102,6 +102,9 @@ ICE_TDAMP_ELASTIC = 1000.0 ! [s or nondim] default = -0.2 ! === 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. diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.all index 5e1ac696da..6116a7624d 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.all @@ -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 @@ -320,11 +322,24 @@ DT_ICE_DYNAMICS = 1200.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 @@ -376,9 +391,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. @@ -395,6 +407,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 @@ -430,6 +445,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 diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.layout b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.layout index f7f84d600d..7a85e8bde9 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.layout +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.layout @@ -3,11 +3,6 @@ GLOBAL_INDEXING = False ! [Boolean] default = False ! If true, use a global lateral indexing convention, so ! that corresponding points on different processors have ! the same index. This does not work with static memory. -! VERONA_COUPLER = False ! [Boolean] - ! If true, carry out all of the sea ice calls so that SIS2 - ! will work with the Verona and earlier releases of the - ! FMS coupler code in configurations that use the exchange - ! grid to communicate with the atmosphere or land. !SYMMETRIC_MEMORY_ = True ! [Boolean] ! If defined, the velocity point data domain includes ! every face of the thickness points. In other words, diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.short index e8ebe4c268..7f2b598234 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/SIS_parameter_doc.short @@ -99,6 +99,9 @@ ICE_TDAMP_ELASTIC = 1000.0 ! [s or nondim] default = -0.2 ! === 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. diff --git a/src/SIS2 b/src/SIS2 index edddaadc29..d9bf8341a2 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit edddaadc29ea21d45472eedf2bb5ed73568fbb02 +Subproject commit d9bf8341a280ec0927a50c0036e81283050ec967