Changeset 1938 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DIA/diawri_dimg.h90

Timestamp:

2010-06-16T16:34:29+02:00 (14 years ago)

Author:

rfurner

Message:

rnf has been separated from emp and emps. Also temperature and salinity of runoff can be specified, and runoff can be added to a user specified depth

File:

• branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DIA/diawri_dimg.h90 (modified) (6 diffs)

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -42 +42 @@
     !!  level 2:  vtau(:,:) * vmask(:,:,1) meridional stress in N. m-2
     !!  level 3:  qsr + qns                total heat flux (W/m2)
-    !!  level 4:  emp (:,:)               E-P flux (mm/day)
+    !!  level 4:  ( emp (:,:)-rnf(:,:) )   E-P flux (mm/day)
     !!  level 5:  tb  (:,:,1)-sst          model SST -forcing sst (degree C) ! deprecated
     !!  level 6:  bsfb(:,:)         streamfunction (m**3/s)
@@ -54 +54 @@
     !!  level 14: qct(:,:)                 equivalent flux due to treshold SST
     !!  level 15: fbt(:,:)                 feedback term .
-    !!  level 16: emps(:,:)                concentration/dilution water flux
+    !!  level 16: ( emps(:,:) - rnf(:,:) ) concentration/dilution water flux
     !!  level 17: fsalt(:,:)               Ice=>ocean net freshwater
     !!  level 18: gps(:,:)                 the surface pressure (m).
@@ -167 +167 @@
        fsel(:,:,2 ) = fsel(:,:,2 ) + vtau(:,:) * vmask(:,:,1)
        fsel(:,:,3 ) = fsel(:,:,3 ) + qsr (:,:) + qns  (:,:) 
-       fsel(:,:,4 ) = fsel(:,:,4 ) + emp (:,:)
+       fsel(:,:,4 ) = fsel(:,:,4 ) + ( emp(:,:)-rnf(:,:) ) 
        !        fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1)  !RB not used
        fsel(:,:,6 ) = fsel(:,:,6 ) + sshn(:,:) 
@@ -179 +179 @@
        !        fsel(:,:,14) = fsel(:,:,14) + qct(:,:)
        !        fsel(:,:,15) = fsel(:,:,15) + fbt(:,:)
-       fsel(:,:,16) = fsel(:,:,16) + emps(:,:)
+       fsel(:,:,16) = fsel(:,:,16) + ( emps(:,:)-rnf(:,:) ) 
 #ifdef key_diaspr   
        fsel(:,:,18) = fsel(:,:,18) + gps(:,:)/g 
@@ -242 +242 @@
           fsel(:,:,2 ) = vtau(:,:) * vmask(:,:,1)
           fsel(:,:,3 ) = (qsr (:,:) + qns (:,:)) * tmask(:,:,1)
-          fsel(:,:,4 ) = emp (:,:) * tmask(:,:,1)
+          fsel(:,:,4 ) = ( emp(:,:)-rnf(:,:) ) * tmask(:,:,1) 
           !         fsel(:,:,5 ) = (tb  (:,:,1) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1) !RB not used
 
@@ -255 +255 @@
           !         fsel(:,:,14) =  qct(:,:)
           !         fsel(:,:,15) =  fbt(:,:)
-          fsel(:,:,16) =  emps(:,:) * tmask(:,:,1)
+          fsel(:,:,16) = ( emps(:,:)-rnf(:,:) ) * tmask(:,:,1) 
 #ifdef key_diaspr           
           fsel(:,:,18) =      gps(:,:) /g