New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5932 – NEMO

Changeset 5932


Ignore:
Timestamp:
2015-11-26T18:25:42+01:00 (8 years ago)
Author:
mathiot
Message:

ice sheet coupling: cosmetic changes + rm duplicate sanity check on isf draft + namelist issues

Location:
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/CONFIG/SHARED/namelist_ref

    r5920 r5932  
    126126   nn_msh      =    1      !  create (=1) a mesh file or not (=0) 
    127127   rn_hmin     =   -3.     !  min depth of the ocean (>0) or min number of ocean level (<0) 
    128    rn_isfhmin  =    0.01   !  treshold (m) to discriminate grounding ice to floating ice 
     128   rn_isfhmin  =    1.00   !  treshold (m) to discriminate grounding ice to floating ice 
    129129   rn_e3zps_min=   20.     !  partial step thickness is set larger than the minimum of 
    130130   rn_e3zps_rat=    0.1    !  rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

    r5920 r5932  
    263263         WRITE(numout,*) '      min depth of the ocean    (>0) or    rn_hmin   = ', rn_hmin 
    264264         WRITE(numout,*) '      min number of ocean level (<0)       ' 
     265         WRITE(numout,*) '      treshold to open the isf cavity   rn_isfhmin   = ', rn_isfhmin, ' (m)' 
    265266         WRITE(numout,*) '      minimum thickness of partial      rn_e3zps_min = ', rn_e3zps_min, ' (m)' 
    266267         WRITE(numout,*) '         step level                     rn_e3zps_rat = ', rn_e3zps_rat 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r5920 r5932  
    574574      !                        
    575575      IF ( .not. ln_sco ) THEN                                !==  set a minimum depth  ==! 
    576          ! patch to avoid case bathy = ice shelf draft and bathy between 0 and zhmin 
    577          IF ( ln_isfcav ) THEN 
    578             WHERE ( bathy == risfdep ) 
    579                bathy   = 0.0_wp ; risfdep = 0.0_wp 
    580             END WHERE 
    581          END IF 
    582          ! end patch 
    583576         IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level 
    584577         ELSE                          ;   ik = MINLOC( gdepw_1d, mask = gdepw_1d > rn_hmin, dim = 1 )  ! from a depth 
     
    12341227      CALL wrk_alloc( jpi, jpj, zbathy, zmask, zrisfdep) 
    12351228      CALL wrk_alloc( jpi, jpj, zmisfdep, zmbathy ) 
    1236  
    12371229 
    12381230      ! (ISF) compute misfdep 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90

    r5920 r5932  
    5151   SUBROUTINE iscpl_init() 
    5252      INTEGER ::   ios           ! Local integer output status for namelist read 
    53       NAMELIST/namsbc_iscpl/nn_fiscpl,ln_hsb 
     53      NAMELIST/namsbc_iscpl/nn_fiscpl,ln_hsb,nn_drown 
    5454      !!---------------------------------------------------------------------- 
    5555      !                                   ! ============ 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

    r5779 r5932  
    3737   USE eosbn2          ! equation of state            (eos bn2 routine) 
    3838   USE domvvl          ! varying vertical mesh 
     39   USE iscplrst        ! ice sheet coupling 
    3940   USE dynspg_oce      ! pressure gradient schemes 
    4041   USE dynspg_flt      ! filtered free surface 
     
    4748   USE wrk_nemo        ! Memory allocation 
    4849   USE timing          ! Timing 
    49    USE iscplrst 
    5050 
    5151   IMPLICIT NONE 
Note: See TracChangeset for help on using the changeset viewer.