Changeset 7442

Timestamp:

2016-12-02T12:46:31+01:00 (7 years ago)

Author:

cbricaud

Message:

correct bug in for TOP and PISCES

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC

Files:

• PISCES/P4Z/p4zche.F90 (modified) (1 diff)
• trcdta.F90 (modified) (8 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90

@@ -34 +34 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)   :: chemo2    ! Solubilities of O2 and CO2
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: fesol    ! solubility of Fe
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   tempis   ! In situ temperature
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   salinprac  ! Practical salinity
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   tempis   ! In situ temperature

branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -159 +159 @@
 
 
-   SUBROUTINE trc_dta( kt, sf_trcdta, ztrcfac, ztrcdta)
+   SUBROUTINE trc_dta( kt, sf_trcdta, ptrcfac, ptrcdta)
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE trc_dta  ***
@@ -173 +173 @@
       INTEGER                          , INTENT(in   )   ::   kt         ! ocean time-step
       TYPE(FLD), DIMENSION(1)          , INTENT(inout)   ::   sf_trcdta  ! array of information on the field to read
-      REAL(wp)                         , INTENT(in   )   ::   ztrcfac    ! multiplication factor
-      REAL(wp),  DIMENSION(jpi,jpj,jpk), INTENT(inout  ) ::   ztrcdta    ! 3D data array
+      REAL(wp)                         , INTENT(in   )   ::   ptrcfac    ! multiplication factor
+      REAL(wp),  DIMENSION(jpi,jpj,jpk), INTENT(inout  ) ::   ptrcdta    ! 3D data array
       !
       INTEGER ::   ji, jj, jk, jl, jkk, ik    ! dummy loop indices
       REAL(wp)::   zl, zi
       REAL(wp), DIMENSION(jpk) ::  ztp                ! 1D workspace
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrcdta   ! 3D  workspace
       CHARACTER(len=100) :: clndta
       !!----------------------------------------------------------------------
@@ -189 +188 @@
          ! read data at kt time step
          CALL fld_read( kt, 1, sf_trcdta )
-         ztrcdta(:,:,:) = sf_trcdta(1)%fnow(:,:,:) * tmask(:,:,:)
+         ptrcdta(:,:,:) = sf_trcdta(1)%fnow(:,:,:) * tmask(:,:,:)
          ! 
          IF( ln_sco ) THEN                !== s- or mixed s-zps-coordinate  ==!
@@ -202 +201 @@
                      zl = gdept_n(ji,jj,jk)
                      IF(     zl < gdept_1d(1  ) ) THEN         ! above the first level of data
-                        ztp(jk) = ztrcdta(ji,jj,1)
+                        ztp(jk) = ptrcdta(ji,jj,1)
                      ELSEIF( zl > gdept_1d(jpk) ) THEN         ! below the last level of data
-                        ztp(jk) = ztrcdta(ji,jj,jpkm1)
+                        ztp(jk) = ptrcdta(ji,jj,jpkm1)
                      ELSE                                      ! inbetween : vertical interpolation between jkk & jkk+1
                         DO jkk = 1, jpkm1                                  ! when  gdept(jkk) < zl < gdept(jkk+1)
                            IF( (zl-gdept_1d(jkk)) * (zl-gdept_1d(jkk+1)) <= 0._wp ) THEN
                               zi = ( zl - gdept_1d(jkk) ) / (gdept_1d(jkk+1)-gdept_1d(jkk))
-                              ztp(jk) = ztrcdta(ji,jj,jkk) + ( ztrcdta(ji,jj,jkk+1) - ztrcdta(ji,jj,jkk) ) * zi
+                              ztp(jk) = ptrcdta(ji,jj,jkk) + ( ptrcdta(ji,jj,jkk+1) - ptrcdta(ji,jj,jkk) ) * zi
                            ENDIF
                         END DO
@@ -215 +214 @@
                   END DO
                   DO jk = 1, jpkm1
-                     ztrcdta(ji,jj,jk) = ztp(jk) * tmask(ji,jj,jk)     ! mask required for mixed zps-s-coord
+                     ptrcdta(ji,jj,jk) = ztp(jk) * tmask(ji,jj,jk)     ! mask required for mixed zps-s-coord
                   END DO
-                  ztrcdta(ji,jj,jpk) = 0._wp
+                  ptrcdta(ji,jj,jpk) = 0._wp
                 END DO
             END DO
@@ -229 +228 @@
                      IF( ik > 1 ) THEN
                         zl = ( gdept_1d(ik) - gdept_n(ji,jj,ik) ) / ( gdept_1d(ik) - gdept_1d(ik-1) )
-                        ztrcdta(ji,jj,ik) = (1.-zl) * ztrcdta(ji,jj,ik) + zl * ztrcdta(ji,jj,ik-1)
+                        ptrcdta(ji,jj,ik) = (1.-zl) * ptrcdta(ji,jj,ik) + zl * ptrcdta(ji,jj,ik-1)
                      ENDIF
                      ik = mikt(ji,jj)
                      IF( ik > 1 ) THEN
                         zl = ( gdept_n(ji,jj,ik) - gdept_1d(ik) ) / ( gdept_1d(ik+1) - gdept_1d(ik) )
-                        ztrcdta(ji,jj,ik) = (1.-zl) * ztrcdta(ji,jj,ik) + zl * ztrcdta(ji,jj,ik+1)
+                        ptrcdta(ji,jj,ik) = (1.-zl) * ptrcdta(ji,jj,ik) + zl * ptrcdta(ji,jj,ik+1)
                      ENDIF
                   END DO
@@ -243 +242 @@
          !
          ! Scale by multiplicative factor
-         ztrcdta(:,:,:) = ztrcdta(:,:,:) * ztrcfac
+         ptrcdta(:,:,:) = ptrcdta(:,:,:) * ptrcfac
          !
       ENDIF
@@ -256 +255 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE trc_dta( kt, sf_trcdta, ztrcfac, ztrcdta)        ! Empty routine
+   SUBROUTINE trc_dta( kt, sf_trcdta, ptrcfac, ptrcdta)        ! Empty routine
       WRITE(*,*) 'trc_dta: You should not have seen this print! error?', kt
    END SUBROUTINE trc_dta