Changeset 1106

Timestamp:

2008-06-10T18:24:12+02:00 (16 years ago)

Author:

rblod

Message:

Correct diawri_dimg according to the new sbc, see ticket #159

Location:

trunk/NEMO/OPA_SRC

Files:

• DIA/diawri_dimg.h90 (modified) (6 diffs)
• SBC/sbcssr.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -45 +45 @@
     !!  level 3:  qsr + qns                total heat flux (W/m2)
     !!  level 4:  emp (:,:)               E-P flux (mm/day)
-    !!  level 5:  tb  (:,:,1)-sst          model SST -forcing sst (degree C)
+    !!  level 5:  tb  (:,:,1)-sst          model SST -forcing sst (degree C) ! deprecated
     !!  level 6:  bsfb(:,:)         streamfunction (m**3/s)
     !!  level 7:  qsr (:,:)         solar flux (W/m2)
@@ -53 +53 @@
     !!  level 11: hmlp(:,:)                mixed layer depth
     !!  level 12: fr_i(:,:)                ice fraction (between 0 and 1)
-    !!  level 13: sst(:,:)                 the observed SST we relax to.
+    !!  level 13: sst(:,:)                 the observed SST we relax to. ! deprecated
     !!  level 14: qct(:,:)                 equivalent flux due to treshold SST
     !!  level 15: fbt(:,:)                 feedback term .
@@ -170 +170 @@
        fsel(:,:,3 ) = fsel(:,:,3 ) + qsr (:,:) + qns  (:,:) 
        fsel(:,:,4 ) = fsel(:,:,4 ) + emp (:,:)
-       fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1) - sf_sst(1)%fnow(:,:)
+       !        fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1)  !RB not used
 #if ! defined key_dynspg_rl
        fsel(:,:,6 ) = fsel(:,:,6 ) + sshn(:,:)    ! SSH
@@ -182 +182 @@
        fsel(:,:,11) = fsel(:,:,11) + hmlp(:,:)
        fsel(:,:,12) = fsel(:,:,12) + fr_i(:,:)
-       fsel(:,:,13) = fsel(:,:,13) + sf_sst(1)%fnow(:,:)
+       !        fsel(:,:,13) = fsel(:,:,13)   !RB not used
        !        fsel(:,:,14) = fsel(:,:,14) + qct(:,:)
        !        fsel(:,:,15) = fsel(:,:,15) + fbt(:,:)
@@ -251 +251 @@
           fsel(:,:,3 ) = (qsr (:,:) + qns (:,:)) * tmask(:,:,1)
           fsel(:,:,4 ) = emp (:,:) * tmask(:,:,1)
-          fsel(:,:,5 ) = (tb  (:,:,1) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1)
+          !         fsel(:,:,5 ) = (tb  (:,:,1) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1) !RB not used
 
 #if ! defined key_dynspg_rl
@@ -264 +264 @@
           fsel(:,:,11) = hmlp(:,:) * tmask(:,:,1)
           fsel(:,:,12) = fr_i(:,:) * tmask(:,:,1)
-          fsel(:,:,13) = sf_sst(1)%fnow(:,:)
+          !         fsel(:,:,13) = sf_sst(1)%fnow(:,:) !RB not used
           !         fsel(:,:,14) =  qct(:,:)
           !         fsel(:,:,15) =  fbt(:,:)

trunk/NEMO/OPA_SRC/SBC/sbcssr.F90

@@ -30 +30 @@
    REAL(wp), ALLOCATABLE, DIMENSION(:)   ::   buffer   ! Temporary buffer for exchange
 
-   TYPE(FLD), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   sf_sst   ! structure of input SST (file informations, fields read)
-   TYPE(FLD), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   sf_sss   ! structure of input SSS (file informations, fields read)
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sst   ! structure of input SST (file informations, fields read)
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sss   ! structure of input SSS (file informations, fields read)
 
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   erp       !: evaporation damping                          [kg/m2/s]