Changeset 1884 for branches/TAM_V3_0/NEMO/OPA_SRC/DTA

Timestamp:

2010-05-27T11:26:52+02:00 (14 years ago)

Author:

rblod

Message:

Light adaptation of NEMO direct model routine to handle TAM

Location:

branches/TAM_V3_0/NEMO/OPA_SRC/DTA

Files:

• dtasal.F90 (modified) (7 diffs)
• dtatem.F90 (modified) (7 diffs)

branches/TAM_V3_0/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -34 +34 @@
    INTEGER ::   &
       numsdt,           &  !: logical unit for data salinity
+#if defined key_pomme_r025
+      nsal1, nsal2 ,     & ! first and second record used
+      nlecsa = 0           ! flag for first read
+#else
       nsal1, nsal2         ! first and second record used
+#endif
    REAL(wp), DIMENSION(jpi,jpj,jpk,2) ::   &
       saldta    ! salinity data at two consecutive times
@@ -89 +94 @@
      REAL(wp)  :: zfac
 #endif
+      CHARACTER (len=38) ::   &
+         cl_sdata = 'data_1m_salinity_nomask '
      REAL(wp), DIMENSION(jpk,2) ::   &
           zsaldta            ! auxiliary array for interpolation
@@ -96 +103 @@
      ! -----------------
      
-     iman  = INT( raamo )
+#if defined key_pomme_r025
+! DRAKKAR : we use input file with 1 month only
+      iman = 1
+#else
+      iman  = INT( raamo )
+#endif
+
 !!! better but change the results     i15 = INT( 2*FLOAT( nday ) / ( FLOAT( nobis(nmonth) ) + 0.5 ) )
      i15   = nday / 16
@@ -109 +122 @@
         nsal1 = 0   ! initializations
         IF(lwp) WRITE(numout,*) ' dta_sal : monthly salinity data in NetCDF file'
-        CALL iom_open ( 'data_1m_salinity_nomask', numsdt ) 
-        
+        CALL iom_open ( cl_sdata, numsdt ) 
+
      ENDIF
      
@@ -117 +130 @@
      ! -------------------
      
+#if defined key_pomme_r025
+!    IF( kt == nit000 .OR. imois /= nsal1 ) THEN
+! In standard ORCA025, no damping is done. We read Levitus only for initial condition
+     IF( kt == nit000 .AND. nlecsa == 0 ) THEN
+        nlecsa =  1
+#else
      IF( kt == nit000 .OR. imois /= nsal1 ) THEN
+#endif
         
         ! 2.1 Calendar computation
@@ -318 +338 @@
            CALL prihre(saldta(:,:,jpkm1,1),jpi,jpj,1,jpi,20,1,jpj,20,1.,numout)
         ENDIF
+#if ! defined key_pomme_r025
      ENDIF
+#endif
      
      
@@ -326 +348 @@
      zxy = FLOAT(nday + 15 - 30*i15)/30.
      s_dta(:,:,:) = ( 1.- zxy ) * saldta(:,:,:,1) + zxy * saldta(:,:,:,2)
+
+#if defined key_pomme_r025
+     ENDIF
+#endif
      
      ! Close the file

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

@@ -33 +33 @@
    INTEGER ::   &
       numtdt,        &  !: logical unit for data temperature
+#if defined key_pomme_r025
+      ntem1, ntem2 , &  ! first and second record used
+      nlecte = 0        ! switch for frist read
+#else
       ntem1, ntem2  ! first and second record used
+#endif
    REAL(wp), DIMENSION(jpi,jpj,jpk,2) ::   &
       temdta            ! temperature data at two consecutive times
@@ -94 +99 @@
       REAL(wp)  :: zfac
 #endif
+      CHARACTER (len=38) ::   &
+         cl_tdata = 'data_1m_potential_temperature_nomask '
       REAL(wp), DIMENSION(jpk,2) ::   &
          ztemdta            ! auxiliary array for interpolation
@@ -101 +108 @@
       ! -----------------
       
+#if defined key_pomme_r025
+! DRAKKAR : we use input file with 1 month only
+      iman = 1
+#else
       iman  = INT( raamo )
+#endif
 !!! better but change the results     i15 = INT( 2*FLOAT( nday ) / ( FLOAT( nobis(nmonth) ) + 0.5 ) )
       i15   = nday / 16
@@ -114 +126 @@
          ntem1= 0   ! initializations
          IF(lwp) WRITE(numout,*) ' dta_tem : Levitus monthly fields'
-         CALL iom_open ( 'data_1m_potential_temperature_nomask', numtdt ) 
+         CALL iom_open ( cl_tdata, numtdt ) 
          
       ENDIF
@@ -122 +134 @@
       ! -------------------
       
+#if defined key_pomme_r025
+! DRAKKAR read only first step
+!     IF( kt == nit000 .OR. imois /= ntem1 ) THEN
+      IF( kt == nit000 .AND. nlecte == 0 ) THEN
+         nlecte = 1
+#else
       IF( kt == nit000 .OR. imois /= ntem1 ) THEN
+#endif
          
          ! Calendar computation
@@ -314 +333 @@
             CALL prihre( temdta(:,:,jpkm1,1), jpi, jpj, 1, jpi, 20, 1, jpj, 20, 1., numout )
          ENDIF
+#if ! defined key_pomme_r025
       ENDIF
+#endif
       
       
@@ -322 +343 @@
       zxy = FLOAT( nday + 15 - 30 * i15 ) / 30.
       t_dta(:,:,:) = (1.-zxy) * temdta(:,:,:,1) + zxy * temdta(:,:,:,2)
-      
+
+#if defined key_pomme_r025
+      ENDIF
+#endif
+
       ! Close the file
       ! --------------