Skip to content

Post PR 800: Update exp. shelice_remeshing code #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jm-c merged 4 commits into from
Jan 13, 2024
Merged

Post PR 800: Update exp. shelice_remeshing code #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03b35b9
Fix after PR #800 changes/addition
jm-c Jan 13, 2024
6d27c11
switch to ref. version and remove local one
jm-c Jan 13, 2024
4f24b3a
remove trailing blanks and few blank lines
jm-c Jan 13, 2024
17cb1df
document fixing shelfice_remeshing exp.
jm-c Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 59 additions & 50 deletions shelfice_remeshing/code/SHELFICE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ C shiPrandtl, shiSchmidt :: constant Prandtl (13.8) and Schmidt (2432.0)
C numbers used to compute gammaTurb
C shiKinVisc :: constant kinetic viscosity used to compute
C gammaTurb (def: 1.95e-5)
C SHI_update_kTopC :: update lateral extension (kTopC) if ice-shelf
C retreats from or expands to model top level
C (requires to define ALLOW_SHELFICE_REMESHING)
C SHELFICEremeshFrequency :: Frequency (in seconds) of call to
C SHELFICE_REMESHING (def: 0. --> no remeshing)
C SHELFICEsplitThreshold :: Thickness fraction remeshing threshold above
Expand Down Expand Up @@ -117,9 +120,46 @@ C-----------------------------------------------------------------------
C \ev
CEOP

COMMON /SHELFICE_PARMS_I/ kTopC,
COMMON /SHELFICE_PARMS_L/
& SHELFICEisOn,
& useISOMIPTD,
& SHELFICEconserve,
& SHELFICEboundaryLayer,
& SHI_withBL_realFWflux,
& SHI_withBL_uStarTopDz,
& no_slip_shelfice,
& SHELFICEwriteState,
& SHELFICE_dump_mdsio,
& SHELFICE_tave_mdsio,
& SHELFICE_dump_mnc,
& SHELFICE_tave_mnc,
& SHELFICEadvDiffHeatFlux,
& SHELFICEuseGammaFrict,
& SHELFICE_oldCalcUStar,
& SHELFICEMassStepping,
& SHELFICEDynMassOnly,
& SHI_update_kTopC
LOGICAL SHELFICEisOn
LOGICAL useISOMIPTD
LOGICAL SHELFICEconserve
LOGICAL SHELFICEboundaryLayer
LOGICAL SHI_withBL_realFWflux
LOGICAL SHI_withBL_uStarTopDz
LOGICAL no_slip_shelfice
LOGICAL SHELFICEwriteState
LOGICAL SHELFICE_dump_mdsio
LOGICAL SHELFICE_tave_mdsio
LOGICAL SHELFICE_dump_mnc
LOGICAL SHELFICE_tave_mnc
LOGICAL SHELFICEadvDiffHeatFlux
LOGICAL SHELFICEuseGammaFrict
LOGICAL SHELFICE_oldCalcUStar
LOGICAL SHELFICEMassStepping
LOGICAL SHELFICEDynMassOnly
LOGICAL SHI_update_kTopC

COMMON /SHELFICE_PARMS_I/
& SHELFICEselectDragQuadr
INTEGER kTopC (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
INTEGER SHELFICEselectDragQuadr

COMMON /SHELFICE_PARMS_R/
Expand Down Expand Up @@ -153,6 +193,23 @@ CEOP
_RL SHELFICEsplitThreshold
_RL SHELFICEmergeThreshold

COMMON /SHELFICE_PARM_C/
& SHELFICEloadAnomalyFile,
& SHELFICEmassFile,
& SHELFICEtopoFile,
& SHELFICEMassDynTendFile,
& SHELFICETransCoeffTFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEloadAnomalyFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEmassFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEtopoFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEMassDynTendFile
CHARACTER*(MAX_LEN_FNAM) SHELFICETransCoeffTFile

C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|

COMMON /SHELFICE_FIELDS_I/ kTopC
INTEGER kTopC (1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)

COMMON /SHELFICE_FIELDS_RL/
& shelficeMass, shelficeMassInit,
& shelficeLoadAnomaly,
Expand Down Expand Up @@ -192,54 +249,6 @@ CEOP
_RS shelficeDragV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)
#endif /* ALLOW_DIAGNOSTICS */

LOGICAL SHELFICEisOn
LOGICAL useISOMIPTD
LOGICAL SHELFICEconserve
LOGICAL SHELFICEboundaryLayer
LOGICAL SHI_withBL_realFWflux
LOGICAL SHI_withBL_uStarTopDz
LOGICAL no_slip_shelfice
LOGICAL SHELFICEwriteState
LOGICAL SHELFICE_dump_mdsio
LOGICAL SHELFICE_tave_mdsio
LOGICAL SHELFICE_dump_mnc
LOGICAL SHELFICE_tave_mnc
LOGICAL SHELFICEadvDiffHeatFlux
LOGICAL SHELFICEuseGammaFrict
LOGICAL SHELFICE_oldCalcUStar
LOGICAL SHELFICEMassStepping
LOGICAL SHELFICEDynMassOnly
COMMON /SHELFICE_PARMS_L/
& SHELFICEisOn,
& useISOMIPTD,
& SHELFICEconserve,
& SHELFICEboundaryLayer,
& SHI_withBL_realFWflux,
& SHI_withBL_uStarTopDz,
& no_slip_shelfice,
& SHELFICEwriteState,
& SHELFICE_dump_mdsio,
& SHELFICE_tave_mdsio,
& SHELFICE_dump_mnc,
& SHELFICE_tave_mnc,
& SHELFICEadvDiffHeatFlux,
& SHELFICEuseGammaFrict,
& SHELFICE_oldCalcUStar,
& SHELFICEMassStepping,
& SHELFICEDynMassOnly

CHARACTER*(MAX_LEN_FNAM) SHELFICEloadAnomalyFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEmassFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEtopoFile
CHARACTER*(MAX_LEN_FNAM) SHELFICEMassDynTendFile
CHARACTER*(MAX_LEN_FNAM) SHELFICETransCoeffTFile
COMMON /SHELFICE_PARM_C/
& SHELFICEloadAnomalyFile,
& SHELFICEmassFile,
& SHELFICEtopoFile,
& SHELFICEMassDynTendFile,
& SHELFICETransCoeffTFile

C-- Customized parameters and fields for this set-up
#include "SHELFICE_LOCAL.h"

Expand Down
7 changes: 6 additions & 1 deletion shelfice_remeshing/code/SHELFICE_OPTIONS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,15 @@ C following Holland and Jenkins, JPO, 1999
#define SHI_ALLOW_GAMMAFRICT
C in uStar expression, use wet-point method to average velocity
C at grid-cell center
!#define SHI_USTAR_WETPOINT
c#define SHI_USTAR_WETPOINT

C allow (vertical) remeshing whenever ocean top thickness factor
C exceeds thresholds
#define ALLOW_SHELFICE_REMESHING
#define SHI_USTAR_TOPDR
C and allow to print message to STDOUT when this happens
c#define SHELFICE_REMESH_PRINT

#undef ALLOW_SHELFICE_GROUNDED_ICE

#endif /* ALLOW_SHELFICE */
Expand Down
Loading