Changeset 8939 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2017-12-07T17:53:39+01:00 (6 years ago)

Author:

clem

Message:

mostly cosmetics

File:

• branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (9 diffs)

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -32 +32 @@
    USE cpl_oasis3     ! OASIS3 coupling
    USE geo2ocean      ! 
-   USE oce   , ONLY : tsn, un, vn, sshn, ub, vb, sshb, fraqsr_1lev
+   USE oce     , ONLY : tsn, un, vn, sshn, ub, vb, sshb, fraqsr_1lev
    USE ocealb         ! 
    USE eosbn2         ! 
-   USE sbcrnf, ONLY : l_rnfcpl
-   USE sbcisf   , ONLY : l_isfcpl
+   USE sbcrnf  , ONLY : l_rnfcpl
+   USE sbcisf  , ONLY : l_isfcpl
 #if defined key_cice
    USE ice_domain_size, only: ncat
@@ -1243 +1243 @@
       ! needed by Met Office
       IF( srcv(jpr_ts_ice)%laction ) THEN 
-        DO jn = 1, jpl 
-          DO jj = 1, jpj 
-            DO ji = 1, jpi 
-              IF (frcv(jpr_ts_ice)%z3(ji,jj,jn) > 0.0) THEN 
-                tsfc_ice(ji,jj,jn) = 0.0 
-              ELSE IF (frcv(jpr_ts_ice)%z3(ji,jj,jn) < -60.0) THEN 
-                tsfc_ice(ji,jj,jn) = -60.0 
-              ELSE 
-                tsfc_ice(ji,jj,jn) = frcv(jpr_ts_ice)%z3(ji,jj,jn) 
-              ENDIF 
-            END DO 
-          END DO 
-        END DO 
+         WHERE    ( frcv(jpr_ts_ice)%z3(:,:,:) > 0.0  )   ;   tsfc_ice(:,:,:) = 0.0 
+         ELSEWHERE( frcv(jpr_ts_ice)%z3(:,:,:) < -60. )   ;   tsfc_ice(:,:,:) = -60.
+         ELSEWHERE                                        ;   tsfc_ice(:,:,:) = frcv(jpr_ts_ice)%z3(:,:,:)
+         END WHERE
       ENDIF 
 #endif
@@ -2066 +2057 @@
 #if defined key_lim3      
       IF( ln_meto_cpl ) THEN
-         !                                                      ! ========================= !
-         SELECT CASE( TRIM( sn_rcv_iceflx%cldes ) )             !    topmelt and botmelt    !
-         !                                                      ! ========================= !
+         !                                                   ! ========================= !
+         SELECT CASE( TRIM( sn_rcv_iceflx%cldes ) )          !  ice topmelt and botmelt  !
+         !                                                   ! ========================= !
          CASE ('coupled')
             qml_ice(:,:,:) = frcv(jpr_topm)%z3(:,:,:) * a_i(:,:,:)
@@ -2186 +2177 @@
          IF( ssnd(jps_tmix)%laction )   CALL cpl_snd( jps_tmix, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )
       ENDIF
-
+      !
+      !                                                      ! ------------------------- !
+      !                                                      ! 1st layer ice/snow temp.  !
+      !                                                      ! ------------------------- !
 #if defined key_lim3
-      !!!!! Getting NEMO4-LIM working at Met Office
-      ! Top layer ice temperature
+      ! needed by  Met Office
       IF( ssnd(jps_ttilyr)%laction) THEN
          SELECT CASE( sn_snd_ttilyr%cldes)
@@ -2198 +2191 @@
          IF( ssnd(jps_ttilyr)%laction )   CALL cpl_snd( jps_ttilyr, isec, ztmp3, info )
       ENDIF
-      !!!!!
 #endif
-
       !                                                      ! ------------------------- !
       !                                                      !           Albedo          !
@@ -2315 +2306 @@
 
 #if defined key_lim3
-      ! NEMO4 - Jules coupling - Met Office
-      ! Send meltpond fields  
+      !                                                      ! ------------------------- !
+      !                                                      !      Ice melt ponds       ! 
+      !                                                      ! ------------------------- !
+      ! needed by Met Office
       IF( ssnd(jps_a_p)%laction .OR. ssnd(jps_ht_p)%laction ) THEN 
          SELECT CASE( sn_snd_mpnd%cldes)  
@@ -2331 +2324 @@
                  ztmp4(:,:,1) = ztmp4(:,:,1) + v_ip(:,:,jpl) 
                ENDDO  
-            CASE default    ;   CALL ctl_stop( 'sbc_cpl_mpd: wrong definition of sn_snd_mpnd%clcat' )  
+            CASE default   ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_mpnd%clcat' )  
             END SELECT  
-         CASE( 'default' )    ;   CALL ctl_stop( 'sbc_cpl_mpd: wrong definition of sn_snd_mpnd%cldes' )     
+         CASE default      ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_mpnd%cldes' )     
          END SELECT  
-         IF( ssnd(jps_a_p)%laction )   CALL cpl_snd( jps_a_p, isec, ztmp3, info )     
+         IF( ssnd(jps_a_p)%laction  )   CALL cpl_snd( jps_a_p , isec, ztmp3, info )     
          IF( ssnd(jps_ht_p)%laction )   CALL cpl_snd( jps_ht_p, isec, ztmp4, info )     
-         ! 
-         ! Send ice effective conductivity 
+      ENDIF 
+      ! 
+      !                                                      ! ------------------------- !
+      !                                                      !     Ice conductivity      ! 
+      !                                                      ! ------------------------- !
+      ! needed by Met Office
+      IF( ssnd(jps_kice)%laction ) THEN 
          SELECT CASE( sn_snd_cond%cldes) 
          CASE( 'weighted ice' )    
             SELECT CASE( sn_snd_cond%clcat ) 
             CASE( 'yes' )    
-                  ztmp3(:,:,1:jpl) =  cnd_ice(:,:,1:jpl) * a_i(:,:,1:jpl) 
+          ztmp3(:,:,1:jpl) =  cnd_ice(:,:,1:jpl) * a_i(:,:,1:jpl) 
             CASE( 'no' ) 
                ztmp3(:,:,:) = 0.0 
@@ -2349 +2347 @@
                  ztmp3(:,:,1) = ztmp3(:,:,1) + cnd_ice(:,:,jl) * a_i(:,:,jl) 
                ENDDO 
-            CASE default                  ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_cond%clcat' ) 
+            CASE default   ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_cond%clcat' ) 
             END SELECT 
          CASE( 'ice only' )    
            ztmp3(:,:,1:jpl) = cnd_ice(:,:,1:jpl) 
+         CASE default      ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_cond%cldes' )     
          END SELECT 
          IF( ssnd(jps_kice)%laction )   CALL cpl_snd( jps_kice, isec, ztmp3, info ) 
       ENDIF 
-      !   
-      !!!!!
 #endif
 
@@ -2682 +2679 @@
 
 #if defined key_lim3
-      ! NEMO4 - Jules coupling - Met Office
+      !                                                      ! ------------------------- !
+      !                                                      ! Sea surface freezing temp ! 
+      !                                                      ! ------------------------- !
+      ! needed by Met Office
       CALL eos_fzp(tsn(:,:,1,jp_sal), sstfrz)
       ztmp1(:,:) = sstfrz(:,:) + rt0