Changeset 10001 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/SBC/sbcice_cice.F90

Timestamp:

2018-07-26T09:50:51+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step I.1 and I.2 (see wiki page)

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/SBC/sbcice_cice.F90 (modified) (20 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/SBC/sbcice_cice.F90

@@ -205 +205 @@
          DO jl=1,ncat
             CALL cice2nemo(aicen(:,:,jl,:),a_i(:,:,jl), 'T', 1. )
-         ENDDO
+         END DO
       ENDIF
 
@@ -214 +214 @@
             fr_iu(ji,jj)=0.5*(fr_i(ji,jj)+fr_i(ji+1,jj))*umask(ji,jj,1)
             fr_iv(ji,jj)=0.5*(fr_i(ji,jj)+fr_i(ji,jj+1))*vmask(ji,jj,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
 
       CALL lbc_lnk_multi( fr_iu , 'U', 1.,  fr_iv , 'V', 1. )
@@ -235 +235 @@
                !
                DO jk = 1,jpkm1                     ! adjust initial vertical scale factors
-                  e3t_n(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshn(:,:)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )
-                  e3t_b(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshb(:,:)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )
-               ENDDO
+                  e3t_n(:,:,jk) = e3t_0(:,:,jk) * ( 1._wp + sshn(:,:) * r1_ht_0(:,:) )
+                  e3t_b(:,:,jk) = e3t_0(:,:,jk) * ( 1._wp + sshb(:,:) * r1_ht_0(:,:) )
+               END DO
                e3t_a(:,:,:) = e3t_b(:,:,:)
                ! Reconstruction of all vertical scale factors at now and before time-steps
@@ -307 +307 @@
                ztmp(ji,jj) = 0.5 * (  fr_iu(ji,jj) * utau(ji,jj)      &
                                     + fr_iu(ji,jj+1) * utau(ji,jj+1) ) * fmask(ji,jj,1)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
          CALL nemo2cice(ztmp,strax,'F', -1. )
 
@@ -317 +317 @@
                ztmp(ji,jj) = 0.5 * (  fr_iv(ji,jj) * vtau(ji,jj)      &
                                     + fr_iv(ji+1,jj) * vtau(ji+1,jj) ) * fmask(ji,jj,1)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
          CALL nemo2cice(ztmp,stray,'F', -1. )
 
@@ -325 +325 @@
             DO jl=1,ncat
                ztmpn(:,:,jl)=qla_ice(:,:,1)*a_i(:,:,jl)
-            ENDDO
+            END DO
          ELSE
 ! emp_ice is set in sbc_cpl_ice_flx as sublimation-snow
@@ -332 +332 @@
             DO jj=1,jpj
                DO ji=1,jpi
-                  IF (fr_i(ji,jj).eq.0.0) THEN
+                  IF (fr_i(ji,jj) == 0._wp ) THEN
                      DO jl=1,ncat
-                        ztmpn(ji,jj,jl)=0.0
-                     ENDDO
+                        ztmpn(ji,jj,jl) = 0._wp
+                     END DO
                      ! This will then be conserved in CICE
                      ztmpn(ji,jj,1)=qla_ice(ji,jj,1)
@@ -341 +341 @@
                      DO jl=1,ncat
                         ztmpn(ji,jj,jl)=qla_ice(ji,jj,1)*a_i(ji,jj,jl)/fr_i(ji,jj)
-                     ENDDO
+                     END DO
                   ENDIF
-               ENDDO
-            ENDDO
+               END DO
+            END DO
          ENDIF
          DO jl=1,ncat
@@ -366 +366 @@
             ENDIF
             CALL nemo2cice(ztmp,fsurfn_f(:,:,jl,:),'T', 1. )
-         ENDDO
+         END DO
 
       ELSE IF (ksbc == jp_blk) THEN
@@ -437 +437 @@
          DO ji=1,jpi
             ztmp(ji,jj)=0.5*(ssu_m(ji,jj)+ssu_m(ji,jj+1))*fmask(ji,jj,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
       CALL nemo2cice(ztmp,uocn,'F', -1. )
 
@@ -445 +445 @@
          DO ji=1,jpim1
             ztmp(ji,jj)=0.5*(ssv_m(ji,jj)+ssv_m(ji+1,jj))*fmask(ji,jj,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
       CALL nemo2cice(ztmp,vocn,'F', -1. )
 
@@ -511 +511 @@
          DO ji=2,jpim1
             ss_iou(ji,jj) = 0.5 * ( ztmp1(ji,jj-1) + ztmp1(ji,jj) ) * umask(ji,jj,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
       CALL lbc_lnk( ss_iou , 'U', -1. )
 
@@ -523 +523 @@
          DO ji=2,jpim1
             ss_iov(ji,jj) = 0.5 * ( ztmp1(ji-1,jj) + ztmp1(ji,jj) ) * vmask(ji,jj,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
       CALL lbc_lnk( ss_iov , 'V', -1. )
 
@@ -609 +609 @@
          DO ji=1,jpi
             nfrzmlt(ji,jj)=MAX(nfrzmlt(ji,jj),0.0)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
 
 #if defined key_cice4
@@ -627 +627 @@
          DO jl=1,ncat
             CALL cice2nemo(aicen(:,:,jl,:),a_i(:,:,jl), 'T', 1. )
-         ENDDO
+         END DO
       ENDIF
 
@@ -636 +636 @@
             fr_iu(ji,jj)=0.5*(fr_i(ji,jj)+fr_i(ji+1,jj))*umask(ji,jj,1)
             fr_iv(ji,jj)=0.5*(fr_i(ji,jj)+fr_i(ji,jj+1))*vmask(ji,jj,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
 
       CALL lbc_lnk_multi( fr_iu , 'U', 1., fr_iv , 'V', 1. )
@@ -872 +872 @@
          DO ji=2,nx_block-1
             pc(ji,jj,1)=pn(ji-1+ji_off,jj-1+jj_off)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
 
 #else
@@ -898 +898 @@
                DO ji=nldit(jn),nleit(jn)
                   png2(ji+nimppt(jn)-1,jj+njmppt(jn)-1)=png(ji,jj,jn)
-               ENDDO
-            ENDDO
-         ENDDO
+               END DO
+            END DO
+         END DO
          DO jj=1,ny_global
             DO ji=1,nx_global
                pcg(ji,jj)=png2(ji+ji_off,jj+jj_off)
-            ENDDO
-         ENDDO
+            END DO
+         END DO
       ENDIF
 
@@ -999 +999 @@
          DO ji=1,jpim1
             pn(ji,jj)=pc(ji+1-ji_off,jj+1-jj_off,1)
-         ENDDO
-      ENDDO
+         END DO
+      END DO
 
 #else
@@ -1021 +1021 @@
                DO ji=nldit(jn),nleit(jn)
                   png(ji,jj,jn)=pcg(ji+nimppt(jn)-1-ji_off,jj+njmppt(jn)-1-jj_off)
-               ENDDO
-            ENDDO
-         ENDDO
+               END DO
+            END DO
+         END DO
       ENDIF