Changeset 4099 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

Timestamp:

2013-10-22T14:07:21+02:00 (11 years ago)

Author:

clem

Message:

 

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -471 +471 @@
       ! Coupled case: since cloud cover is not received from atmosphere 
       !               ===> defined as constant value -> definition done in sbc_cpl_init
-      fr1_i0(:,:) = 0.18
-      fr2_i0(:,:) = 0.82
+      IF ( ALLOCATED (fr1_i0)) fr1_i0 (:,:) = 0.18
+      IF ( ALLOCATED (fr2_i0)) fr2_i0 (:,:) = 0.82
       !                                                      ! ------------------------- !
       !                                                      !      10m wind module      !   
@@ -931 +931 @@
       CALL wrk_alloc( jpi,jpj, ztx, zty )
 
-      IF( srcv(jpr_itx1)%laction ) THEN   ;   itx =  jpr_itx1   
+!AC Pour eviter un stress nul sur la glace dans le cas mixed oce-ice
+      IF( srcv(jpr_itx1)%laction .AND. TRIM( sn_rcv_tau%cldes ) == 'oce and ice') THEN   ;   itx =  jpr_itx1   
       ELSE                                ;   itx =  jpr_otx1
       ENDIF
@@ -938 +939 @@
       IF(  nrcvinfo(itx) == OASIS_Rcv ) THEN
 
-         !                                                      ! ======================= !
-         IF( srcv(jpr_itx1)%laction ) THEN                      !   ice stress received   !
-            !                                                   ! ======================= !
+         !                                                                                              ! ======================= !
+!AC Pour eviter un stress nul sur la glace dans le cas mixes oce-ice
+         IF( srcv(jpr_itx1)%laction .AND. TRIM( sn_rcv_tau%cldes ) == 'oce and ice') THEN               !   ice stress received   !
+            !                                                                                           ! ======================= !
             !  
             IF( TRIM( sn_rcv_tau%clvref ) == 'cartesian' ) THEN            ! 2 components on the sphere