Changeset 2236 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DTA/dtatem.F90

Timestamp:

2010-10-12T20:49:32+02:00 (14 years ago)

Author:

cetlod

Message:

First guess of NEMO_v3.3

File:

• branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DTA/dtatem.F90 (modified) (7 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/DTA/dtatem.F90

@@ -69 +69 @@
       !!   8.5  !  02-09  (G. Madec)  F90: Free form and module
       !!----------------------------------------------------------------------
-      !! * Arguments
       INTEGER, INTENT( in ) ::   kt     ! ocean time-step
 
-      !! * Local declarations
       INTEGER ::   ji, jj, jk, jl, jkk            ! dummy loop indicies
       INTEGER ::   ik, ierror                     ! temporary integers
@@ -102 +100 @@
          sn_tem = FLD_N( 'temperature',  -1.  ,  'votemper',  .false.   , .true.  ,  'yearly'  , ''       , ''         )
 
-         REWIND( numnam )            ! ... read in namlist namdta_tem 
+         REWIND( numnam )         ! ... read in namlist namdta_tem 
          READ( numnam, namdta_tem ) 
 
-         IF(lwp) THEN                ! control print
+         IF(lwp) THEN              ! control print
             WRITE(numout,*)
             WRITE(numout,*) 'dta_tem : Temperature Climatology '
@@ -116 +114 @@
 
 #if defined key_orca_lev10
-         ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpkdta  ) )
-         ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpkdta,2) )
+                                ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpkdta)   )
+         IF( sn_tem%ln_tint )   ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpkdta,2) )
 #else
-         ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk  ) )
-         ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2) )
+                                ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)   )
+         IF( sn_tem%ln_tint )   ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2) )
 #endif
          ! fill sf_tem with sn_tem and control print
          CALL fld_fill( sf_tem, (/ sn_tem /), cn_dir, 'dta_tem', 'Temperature data', 'namdta_tem' )
          linit_tem = .TRUE.
-
+         !
       ENDIF
       
@@ -133 +131 @@
       CALL fld_read( kt, 1, sf_tem )
        
-      IF( lwp .AND. kt==nn_it000 )THEN 
+      IF( lwp .AND. kt == nit000 )THEN 
          WRITE(numout,*)
          WRITE(numout,*) ' read Levitus temperature ok'
@@ -141 +139 @@
 #if defined key_tradmp
       IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN
-            
          !                                        ! =======================
          !                                        !  ORCA_R2 configuration
@@ -236 +233 @@
          END DO
             
-         IF( lwp .AND. kt==nn_it000 )THEN
+         IF( lwp .AND. kt == nit000 )THEN
             WRITE(numout,*)
             WRITE(numout,*) ' Levitus temperature data interpolated to s-coordinate'
@@ -260 +257 @@
    ENDIF
          
-   IF( lwp .AND. kt==nn_it000 ) THEN
+   IF( lwp .AND. kt == nit000 ) THEN
       WRITE(numout,*) ' temperature Levitus '
       WRITE(numout,*)