Changeset 1938 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcmod.F90

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/SBC/sbcmod.F90 (modified) (3 diffs)

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -185 +185 @@
       INTEGER, INTENT(in) ::   kt       ! ocean time step
       !!---------------------------------------------------------------------
+
+      emp(:,:)=0.0  
+      emps(:,:)=0.0  
+      rnf(:,:)=0.0 
 
       CALL iom_setkt( kt + nn_fsbc - 1 )         !  in sbc, iom_put is called every nn_fsbc time step
@@ -237 +241 @@
       !
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
-         CALL iom_put( "emp"    , emp       )                   ! upward water flux
-         CALL iom_put( "emps"   , emps      )                   ! c/d water flux
-         CALL iom_put( "qns+qsr", qns + qsr )                   ! total heat flux   (caution if ln_dm2dc=true, to be 
-         CALL iom_put( "qns"    , qns       )                   ! solar heat flux    moved after the call to iom_setkt)
-         CALL iom_put( "qsr"    ,       qsr )                   ! solar heat flux    moved after the call to iom_setkt)
+         CALL iom_put( "emp-rnf"  , (emp-rnf)  )                ! upward water flux 
+         CALL iom_put( "emps-rnf" , (emps-rnf) )                ! c/d water flux 
+         CALL iom_put( "qns+qsr"  , qns + qsr  )                ! total heat flux   (caution if ln_dm2dc=true, to be 
+         CALL iom_put( "qns"      , qns        )                ! solar heat flux    moved after the call to iom_setkt)
+         CALL iom_put( "qsr"      ,       qsr  )                ! solar heat flux    moved after the call to iom_setkt)
          IF(  nn_ice > 0 )   CALL iom_put( "ice_cover", fr_i )  ! ice fraction 
       ENDIF
@@ -254 +258 @@
       IF(ln_ctl) THEN         ! print mean trends (used for debugging)
          CALL prt_ctl(tab2d_1=fr_i   , clinfo1=' fr_i - : ', mask1=tmask, ovlap=1 )
-         CALL prt_ctl(tab2d_1=emp    , clinfo1=' emp  - : ', mask1=tmask, ovlap=1 )
-         CALL prt_ctl(tab2d_1=emps   , clinfo1=' emps - : ', mask1=tmask, ovlap=1 )
+         CALL prt_ctl(tab2d_1=(emp-rnf) , clinfo1=' emp-rnf  - : ', mask1=tmask, ovlap=1 ) 
+         CALL prt_ctl(tab2d_1=(emps-rnf), clinfo1=' emps-rnf - : ', mask1=tmask, ovlap=1 ) 
          CALL prt_ctl(tab2d_1=qns    , clinfo1=' qns  - : ', mask1=tmask, ovlap=1 )
          CALL prt_ctl(tab2d_1=qsr    , clinfo1=' qsr  - : ', mask1=tmask, ovlap=1 )