Changeset 2528 for trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) (8 diffs, 1 prop)

trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -36 +36 @@
 #  include "top_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/TOP 1.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
-   !!----------------------------------------------------------------------
-
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
-   !!----------------------------------------------------------------------
-   !!   Default case                                            NetCDF file
-   !!----------------------------------------------------------------------
-   
    SUBROUTINE trc_dta( kt )
       !!----------------------------------------------------------------------
@@ -63 +58 @@
       !!
       CHARACTER (len=39) ::   clname(jptra)
-      INTEGER, PARAMETER ::   &
-         jpmonth = 12    ! number of months
+      INTEGER, PARAMETER ::   jpmonth = 12    ! number of months
       INTEGER ::   ji, jj, jn, jl 
       INTEGER ::   imois, iman, i15, ik  ! temporary integers 
       REAL(wp) ::   zxy, zl
+!!gm HERE the daymod should be used instead of computation of month and co !!
+!!gm      better in case of real calandar and leap-years !
       !!----------------------------------------------------------------------
 
@@ -74 +70 @@
          IF( lutini(jn) ) THEN 
 
-            IF ( kt == nittrc000 ) THEN
+            IF ( kt == nit000 ) THEN
                !! 3D tracer data
                IF(lwp)WRITE(numout,*)
@@ -92 +88 @@
             ! --------------------
 
-            IF ( kt == nittrc000 .AND. nlectr(jn) == 0 ) THEN
+            IF ( kt == nit000 .AND. nlectr(jn) == 0 ) THEN
                ntrc1(jn) = 0
                IF(lwp) WRITE(numout,*) ' trc_dta : Levitus tracer data monthly fields'
@@ -107 +103 @@
 # if defined key_pisces
             ! Read montly file
-            IF( ( kt == nittrc000 .AND. nlectr(jn) == 0)  .OR. imois /= ntrc1(jn) ) THEN
+            IF( ( kt == nit000 .AND. nlectr(jn) == 0)  .OR. imois /= ntrc1(jn) ) THEN
                nlectr(jn) = 1
 
@@ -142 +138 @@
                      DO jj = 1, jpj                ! interpolation of temperature at the last level
                         DO ji = 1, jpi
-                           ik = mbathy(ji,jj) - 1
+                           ik = mbkt(ji,jj)
                            IF( ik > 2 ) THEN
                               zl = ( gdept_0(ik) - fsdept_0(ji,jj,ik) ) / ( gdept_0(ik) - gdept_0(ik-1) )
@@ -189 +185 @@
 # else
             ! Read init file only
-            IF( kt == nittrc000  ) THEN
+            IF( kt == nit000  ) THEN
                ntrc1(jn) = 1
                CALL iom_get ( numtr(jn), jpdom_data, ctrcnm(jn), trdta(:,:,:,jn), ntrc1(jn) )
@@ -196 +192 @@
             ENDIF 
 # endif
-
          ENDIF