Changeset 990 for branches/dev_003_CPL/NEMO/OFF_SRC/dtadyn.F90

Timestamp:

2008-05-23T16:38:21+02:00 (16 years ago)

Author:

smasson

Message:

dev_003_CPL: to the trunk , see ticket #155

File:

• branches/dev_003_CPL/NEMO/OFF_SRC/dtadyn.F90 (modified) (7 diffs)

branches/dev_003_CPL/NEMO/OFF_SRC/dtadyn.F90

@@ -15 +15 @@
    USE in_out_manager  ! I/O manager
    USE phycst          ! physical constants
-   USE ocesbc
+   USE sbc_oce
    USE ldfslp
-   USE blk_oce
    USE ldfeiv          ! eddy induced velocity coef.      (ldf_eiv routine)
    USE ldftra_oce      ! ocean tracer   lateral physics
@@ -35 +34 @@
 
    !! * Module variables
-   INTEGER , PUBLIC, PARAMETER :: jpflx = 13
+   INTEGER , PUBLIC, PARAMETER :: jpflx = 7
    INTEGER , PUBLIC, PARAMETER :: &
       jptaux = 1 , & ! indice in flux for taux
       jptauy = 2 , & ! indice in flux for tauy
-      jpwind = 3 , & ! indice in flux for wspd
-      jpemp = 4  , & ! indice in flux for E-P
-      jpice = 5  , & ! indice in flux for ice concentration
-      jpqsr = 6      ! indice in flux for shortwave heat flux 
+      jpemp = 3  , & ! indice in flux for E-P
+      jpice = 4  , & ! indice in flux for ice concentration
+      jpqsr = 5      ! indice in flux for shortwave heat flux 
 
    LOGICAL , PUBLIC :: &
@@ -563 +561 @@
        ! keep needed fluxes
        !
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily
-                    vatm(:,:) = flx(:,:,jpwind)
-#endif
                     freeze(:,:) = flx(:,:,jpice)
                     emp(:,:) = flx(:,:,jpemp)
@@ -630 +625 @@
        ! keep needed fluxes
        !
-#if defined key_flx_bulk_monthly || defined key_flx_bulk_daily
-                  vatm(:,:) = flx(:,:,jpwind)
-#endif
                   freeze(:,:) = flx(:,:,jpice)
                   emp(:,:)    = flx(:,:,jpemp)
@@ -688 +680 @@
 
       REAL(wp), DIMENSION(jpi,jpj) :: &
-         zemp, zqsr, zmld, zice, zwspd 
+         zemp, zqsr, zmld, zice 
 #if defined key_trcbbl_dif   ||   defined key_trcbbl_adv
       REAL(wp), DIMENSION(jpi,jpj) :: &
@@ -764 +756 @@
       CALL iom_get ( numfl_t, jpdom_data, 'soshfldo', zqsr (:,:  ), jkenr )
       CALL iom_get ( numfl_t, jpdom_data, 'soicecov', zice (:,:  ), jkenr )
-      CALL iom_get ( numfl_t, jpdom_data, 'sowindsp', zwspd(:,:  ), jkenr )
 
       ! file grid-U
@@ -896 +887 @@
       ! flux :
       !
-      flxdta(:,:,jpwind,2) = zwspd(:,:) * tmask(:,:,1)
       flxdta(:,:,jpice,2)  = MIN( 1., zice(:,:) ) * tmask(:,:,1)
       flxdta(:,:,jpemp,2)  = zemp(:,:) * tmask(:,:,1)