Changeset 3680 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90

Timestamp:

2012-11-27T15:42:24+01:00 (11 years ago)

Author:

rblod

Message:

First commit of the final branch for 2012 (future nemo_3_5), see ticket #1028

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) (2 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90

@@ -50 +50 @@
       !!            tra = tra + emp * trn / e3t   for k=1
       !!         where emp, the surface freshwater budget (evaporation minus
-      !!         precipitation minus runoff) given in kg/m2/s is divided
+      !!         precipitation ) given in kg/m2/s is divided
       !!         by 1035 kg/m3 (density of ocean water) to obtain m/s.
       !!
@@ -79 +79 @@
       ENDIF
 
+      ! Coupling online : river runoff is added to the horizontal divergence (hdivn) in the subroutine sbc_rnf_div 
+      ! one only consider the concentration/dilution effect due to evaporation minus precipitation + freezing/melting of sea-ice
 
-      IF( lk_offline ) THEN          ! sfx in dynamical files contains sfx  - rnf
-         zsfx(:,:) = sfx(:,:)  
-      ELSE                           ! Concentration dilution effect on tracer due to evaporation, precipitation, and river runoff
-         IF( lk_vvl ) THEN                      ! volume variable
-            zsfx(:,:) = sfx(:,:) - emp(:,:)   
-!!ch         zsfx(:,:) = 0.
-         ELSE                                   ! linear free surface
-            IF( ln_rnf ) THEN  ;  zsfx(:,:) = sfx(:,:) - rnf(:,:)   !  E-P-R
-            ELSE               ;  zsfx(:,:) = sfx(:,:)
-            ENDIF 
-         ENDIF 
-      ENDIF 
+      IF( .NOT. lk_offline .AND. lk_vvl ) THEN  ! online coupling + volume variable
+         zemps(:,:) = sfx(:,:) - emp(:,:)
+      ELSE
+         zemps(:,:) = emp(:,:)
+      ENDIF
 
       ! 0. initialization