Changeset 4148 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90

Timestamp:

2013-11-04T13:54:28+01:00 (10 years ago)

Author:

cetlod

Message:

merge in trunk changes between r3853 and r3940 and commit the changes, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90

@@ -77 +77 @@
       !
       IF( ln_rsttr .AND. kt == nittrc000 )                         CALL p4z_rst( nittrc000, 'READ' )  !* read or initialize all required fields 
-      IF( ln_rsttr  .AND. ln_pisclo )                              CALL p4z_clo            ! damping on closed seas
       IF( ln_pisdmp .AND. MOD( kt - nn_dttrc, nn_pisdmp ) == 0 )   CALL p4z_dmp( kt )      ! Relaxation of some tracers
       !
@@ -165 +164 @@
       NAMELIST/nampiskrp/ xkr_eta, xkr_zeta, xkr_ncontent, xkr_mass_min, xkr_mass_max
 #endif
-      NAMELIST/nampisdmp/ ln_pisdmp, nn_pisdmp, ln_pisclo
+      NAMELIST/nampisdmp/ ln_pisdmp, nn_pisdmp
       NAMELIST/nampismass/ ln_check_mass
       INTEGER :: ios                 ! Local integer output status for namelist read
@@ -234 +233 @@
          WRITE(numout,*) '    Relaxation of tracer to glodap mean value             ln_pisdmp      =', ln_pisdmp
          WRITE(numout,*) '    Frequency of Relaxation                               nn_pisdmp      =', nn_pisdmp
-         WRITE(numout,*) '    Restoring of tracer to initial value  on closed seas  ln_pisclo      =', ln_pisclo
          WRITE(numout,*) ' '
       ENDIF
@@ -436 +434 @@
    END SUBROUTINE p4z_chk_mass
 
-   SUBROUTINE p4z_clo   
-      !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE p4z_clo  ***
-      !!
-      !! ** Purpose :   Closed sea domain initialization
-      !!
-      !! ** Method  :   if a closed sea is located only in a model grid point
-      !!                we restore to initial data
-      !!
-      !! ** Action  :   ictsi1(), ictsj1() : south-west closed sea limits (i,j)
-      !!                ictsi2(), ictsj2() : north-east Closed sea limits (i,j)
-      !!----------------------------------------------------------------------
-      INTEGER, PARAMETER           ::   npicts   = 4        ! number of closed sea
-      INTEGER, DIMENSION(npicts)   ::   ictsi1, ictsj1      ! south-west closed sea limits (i,j)
-      INTEGER, DIMENSION(npicts)   ::   ictsi2, ictsj2      ! north-east closed sea limits (i,j)
-      INTEGER :: ji, jj, jk, jn, jl, jc                     ! dummy loop indices
-      INTEGER :: ierr                                       ! local integer
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::  ztrcdta     ! 4D  workspace
-      !!----------------------------------------------------------------------
-
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*)' p4z_clo : closed seas '
-      IF(lwp) WRITE(numout,*)'~~~~~~~'
-
-      ! initial values
-      ictsi1(:) = 1  ;  ictsi2(:) = 1 
-      ictsj1(:) = 1  ;  ictsj2(:) = 1 
-
-      ! set the closed seas (in data domain indices)
-      ! -------------------
-
-      IF( cp_cfg == "orca" ) THEN
-         !
-         SELECT CASE ( jp_cfg )
-         !                                           ! =======================
-         CASE ( 2 )                                  !  ORCA_R2 configuration
-            !                                        ! =======================
-            !                                            ! Caspian Sea
-            ictsi1(1)   =  11  ;  ictsj1(1)   = 103
-            ictsi2(1)   =  17  ;  ictsj2(1)   = 112
-            !                                            ! Great North American Lakes
-            ictsi1(2)   =  97  ;  ictsj1(2)   = 107
-            ictsi2(2)   = 103  ;  ictsj2(2)   = 111
-            !                                            ! Black Sea 1 : west part of the Black Sea
-            ictsi1(3)   = 174  ; ictsj1(3)   = 107
-            ictsi2(3)   = 181  ; ictsj2(3)   = 112
-            !                                            ! Black Sea 2 : est part of the Black Sea
-            ictsi1(4)   =   2  ;  ictsj1(4)   = 107
-            ictsi2(4)   =   6  ;  ictsj2(4)   = 112
-            !                                        ! =======================
-         CASE ( 4 )                                  !  ORCA_R4 configuration
-            !                                        ! =======================
-            !                                            ! Caspian Sea
-            ictsi1(1)   =  4  ;  ictsj1(1)   = 53
-            ictsi2(1)   =  4  ;  ictsj2(1)   = 56
-            !                                            ! Great North American Lakes
-            ictsi1(2)   = 49  ;  ictsj1(2)   = 55
-            ictsi2(2)   = 51  ;  ictsj2(2)   = 56
-            !                                            ! Black Sea
-            ictsi1(3)   = 88  ;  ictsj1(3)   = 55
-            ictsi2(3)   = 91  ;  ictsj2(3)   = 56
-            !                                            ! Baltic Sea
-            ictsi1(4)   = 75  ;  ictsj1(4)   = 59
-            ictsi2(4)   = 76  ;  ictsj2(4)   = 61
-            !                                        ! =======================
-            !                                        ! =======================
-         CASE ( 025 )                                ! ORCA_R025 configuration
-            !                                        ! =======================
-                                                     ! Caspian + Aral sea
-            ictsi1(1)   = 1330 ; ictsj1(1)   = 645
-            ictsi2(1)   = 1400 ; ictsj2(1)   = 795
-            !                                        ! Azov Sea
-            ictsi1(2)   = 1284 ; ictsj1(2)   = 722
-            ictsi2(2)   = 1304 ; ictsj2(2)   = 747
-            !
-         END SELECT
-         !
-      ENDIF
-
-      ! convert the position in local domain indices
-      ! --------------------------------------------
-      DO jc = 1, npicts 
-         ictsi1(jc)   = mi0( ictsi1(jc) )
-         ictsj1(jc)   = mj0( ictsj1(jc) )
-
-         ictsi2(jc)   = mi1( ictsi2(jc) )
-         ictsj2(jc)   = mj1( ictsj2(jc) )
-      END DO
-
-      ! Restore close seas values to initial data
-      IF( ln_trcdta .AND. nb_trcdta > 0 )  THEN   ! Initialisation of tracer from a file that may also be used for damping
-         !
-         CALL wrk_alloc( jpi, jpj, jpk, nb_trcdta, ztrcdta )   ! Memory allocation
-         !
-         CALL trc_dta( nittrc000, ztrcdta )   ! read tracer data at nittrc000
-         !
-         DO jn = 1, jptra
-            IF( ln_trc_ini(jn) ) THEN      ! update passive tracers arrays with input data read from file
-                jl = n_trc_index(jn)
-                DO jc = 1, npicts
-                   DO jk = 1, jpkm1
-                      DO jj = ictsj1(jc), ictsj2(jc)
-                         DO ji = ictsi1(jc), ictsi2(jc)
-                            trn(ji,jj,jk,jn) = ztrcdta(ji,jj,jk,jl) * tmask(ji,jj,jk)
-                            trb(ji,jj,jk,jn) = trn(ji,jj,jk,jn)
-                         ENDDO
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-          ENDDO
-          CALL wrk_dealloc( jpi, jpj, jpk, nb_trcdta, ztrcdta )
-      ENDIF
-      !
-   END SUBROUTINE p4z_clo
 #else
    !!======================================================================