Changeset 841 for trunk/NEMO/OPA_SRC

Timestamp:

2008-03-11T15:50:54+01:00 (16 years ago)

Author:

rblod

Message:

Light changes in SBC routines to use classical CLIO bulks with LIM3

Location:

trunk/NEMO/OPA_SRC/SBC

Files:

• flx_bulk_daily.h90 (modified) (2 diffs)
• flx_bulk_monthly.h90 (modified) (2 diffs)
• tau_forced_daily.h90 (modified) (1 diff)
• tau_forced_monthly.h90 (modified) (1 diff)
• taumod.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/SBC/flx_bulk_daily.h90

@@ -62 +62 @@
       USE blk_oce         ! bulk variable
       USE bulk            ! bulk module
+      USE ice_oce
 
       !! * arguments
@@ -187 +188 @@
 
       CALL blk(kt)
+
+#if defined key_lim3
+      tatm_ice(:,:) = tatm(:,:)
+#endif
       
       CALL FLUSH(numout)

trunk/NEMO/OPA_SRC/SBC/flx_bulk_monthly.h90

@@ -71 +71 @@
       USE blk_oce         ! bulk variable
       USE bulk            ! bulk module
+      USE ice_oce
 
       !! * arguments
@@ -227 +228 @@
       CALL blk( kt )                ! bulk formulea fluxes 
 
+#if defined key_lim3
+      tatm_ice(:,:) = tatm(:,:)
+#endif
+
       ! ------------------- !
       ! Last call kt=nitend !

trunk/NEMO/OPA_SRC/SBC/tau_forced_daily.h90

@@ -78 +78 @@
          CALL iom_get ( numtau, jpdom_data, 'taux', taux, nday_year )
          CALL iom_get ( numtav, jpdom_data, 'tauy', tauy, nday_year )
+
+#if defined key_lim3
+      tauxw = taux
+      tauyw = tauy
+#endif
             
          IF (lwp .AND. nitend-nit000 <= 100 ) THEN

trunk/NEMO/OPA_SRC/SBC/tau_forced_monthly.h90

@@ -136 +136 @@
       tauy(:,:) = (1.-zxy) * tauy_dta(:,:,1) + zxy * tauy_dta(:,:,2)
 
+#if defined key_lim3
+      tauxw = taux 
+      tauyw = tauy 
+#endif
+
       ! ------------------- !
       ! Last call kt=nitend !

trunk/NEMO/OPA_SRC/SBC/taumod.F90

@@ -30 +30 @@
    PUBLIC tau                ! routine called by step.F90
 
-   !! * Share modules variables
+  !! * Share modules variables
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &
-      taux, tauy             !: surface stress components in (i,j) referential
+      taux, tauy,      &  !: surface stress components in (i,j) referential
+      ! TAU BUG
+#if defined key_lim3
+      tauxw, tauyw,    &  !: surface wind stress components in (i,j) referential
+      slotx, sloty,    &  !: time-slope for surface windstress in (i,j) referential
+      tauxg, tauyg        !: surface stress components in geographical
+      !                   !  referential (used in output)
+#endif
+
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005)