Changeset 5920 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90

Timestamp:

2015-11-25T17:58:51+01:00 (9 years ago)

Author:

mathiot

Message:

ice sheet coupling: add treshold to define grounded area, remove useless va
riable, change some variable name + add some namelist parameter

File:

• branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (modified) (4 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90

@@ -22 +22 @@
    PUBLIC   iscpl_init      
    PUBLIC   iscpl_alloc 
-   !!                                                     !!* namsbc_iscpl namelist *
+   !!                                                      !!* namsbc_iscpl namelist *
    LOGICAL , PUBLIC                                        ::   ln_hsb
-   REAL(wp), PUBLIC                                        ::   rn_fiscpl
+   INTEGER , PUBLIC                                        ::   nn_fiscpl, nstp_iscpl
+   INTEGER , PUBLIC                                        ::   nn_drown
    REAL(wp), PUBLIC                                        ::   rdt_iscpl
-   !!                                                     !!* namsbc_iscpl namelist *
+   !!                                                      !!* namsbc_iscpl namelist *
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:  ) ::   hdiv_iscpl
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::   htsc_iscpl
@@ -50 +51 @@
    SUBROUTINE iscpl_init()
       INTEGER ::   ios           ! Local integer output status for namelist read
-      NAMELIST/namsbc_iscpl/rn_fiscpl,ln_hsb
+      NAMELIST/namsbc_iscpl/nn_fiscpl,ln_hsb
       !!----------------------------------------------------------------------
       !                                   ! ============
@@ -56 +57 @@
       !                                   ! ============
       !
-      rn_fiscpl = 2480.
+      nn_fiscpl = 0
       ln_hsb    = .FALSE.
       REWIND( numnam_ref )              ! Namelist namsbc_iscpl in reference namelist : Ice sheet coupling
@@ -67 +68 @@
       IF(lwm) WRITE ( numond, namsbc_iscpl )
       !
-      rdt_iscpl=MAX(rn_fiscpl, nitend-nit000+1.0) ! the coupling period have to be less or egal than the total number of time step
+      nstp_iscpl=MIN(nn_fiscpl, nitend-nit000+1) ! the coupling period have to be less or egal than the total number of time step
+      rdt_iscpl = nstp_iscpl * rn_rdt
       !
       IF (lwp) THEN
          WRITE(numout,*) 'iscpl_rst:'
          WRITE(numout,*) '~~~~~~~~~'
-         WRITE(numout,*) ' coupling     flag (ln_iscpl )  = ', ln_iscpl
-         WRITE(numout,*) ' conservation flag (ln_hsb   )  = ', ln_hsb
-         WRITE(numout,*) ' nb of stp for cons (rn_fiscpl) = ', rdt_iscpl
+         WRITE(numout,*) ' coupling     flag (ln_iscpl )            = ', ln_iscpl
+         WRITE(numout,*) ' conservation flag (ln_hsb   )            = ', ln_hsb
+         WRITE(numout,*) ' nb of stp for cons (rn_fiscpl)           = ', nstp_iscpl
+         IF (nstp_iscpl .NE. nn_fiscpl) WRITE(numout,*) 'W A R N I N G: nb of stp for cons has been modified &
+            &                                           (larger than run length)'
+         WRITE(numout,*) ' coupling time step                       = ', rdt_iscpl
+         WRITE(numout,*) ' number of call of the extrapolation loop = ', nn_drown
       END IF