Changeset 7525 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

Timestamp:

2017-01-04T17:47:47+01:00 (7 years ago)

Author:

mocavero

Message:

changes after review

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (5 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

@@ -132 +132 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-      zqnsoce(ji,jj) = qns(ji,jj)
+            zqnsoce(ji,jj) = qns(ji,jj)
          END DO
       END DO
 !$OMP END DO NOWAIT
+
 !$OMP DO schedule(static) private(jj,ji,zinda,ifvt,i1mfr,idfr,iflt,ial,iadv,ifral,ifrdv,zqsr,zqns,zqhc,zemp,zemp_snw,zfmm,zfsalt,zcd) 
       DO jj = 1, jpj
@@ -437 +438 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  utau_oce(ji,jj) = utau(ji,jj)                 !* save the air-ocean stresses at ice time-step
+                  utau_oce(ji,jj) = utau(ji,jj)       !* save the air-ocean stresses at ice time-step
                   vtau_oce(ji,jj) = vtau(ji,jj)
                END DO
@@ -497 +498 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            soce_0(ji,jj) = soce                     ! constant SSS and ice salinity used in levitating sea-ice case
+            soce_0(ji,jj) = soce             ! constant SSS and ice salinity used in levitating sea-ice case
             sice_0(ji,jj) = sice
          END DO
@@ -520 +521 @@
       ELSE
 !$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-         snwice_mass  (ji,jj) = 0.e0           ! no mass exchanges
-         snwice_mass_b(ji,jj) = 0.e0           ! no mass exchanges
-         snwice_fmass (ji,jj) = 0.e0           ! no mass exchanges
-         END DO
-      END DO
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               snwice_mass  (ji,jj) = 0.e0           ! no mass exchanges
+               snwice_mass_b(ji,jj) = 0.e0           ! no mass exchanges
+               snwice_fmass (ji,jj) = 0.e0           ! no mass exchanges
+            END DO
+         END DO
       ENDIF
       IF( nn_ice_embd == 2 .AND.          &  ! full embedment (case 2) & no restart : 
          &   .NOT.ln_rstart ) THEN           ! deplete the initial ssh below sea-ice area
 !$OMP PARALLEL DO schedule(static) private(jj, ji)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-         sshn(ji,jj) = sshn(ji,jj) - snwice_mass(ji,jj) * r1_rau0
-         sshb(ji,jj) = sshb(ji,jj) - snwice_mass(ji,jj) * r1_rau0
-         END DO
-      END DO
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               sshn(ji,jj) = sshn(ji,jj) - snwice_mass(ji,jj) * r1_rau0
+               sshb(ji,jj) = sshb(ji,jj) - snwice_mass(ji,jj) * r1_rau0
+            END DO
+         END DO
 !!gm I really don't like this staff here...  Find a way to put that elsewhere or differently
 !!gm
@@ -542 +543 @@
 
 !$OMP PARALLEL
-!$OMP DO schedule(static) private(jk)
-            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)) )
-            end do
+!$OMP DO schedule(static) private(jk, jj, ji)
+            DO jk = 1,jpkm1                     ! adjust initial vertical scale factors
+               DO jj = 1, jpj
+                  DO ji = 1, jpi
+                     e3t_n(ji,jj,jk) = e3t_0(ji,jj,jk)*( 1._wp + sshn(ji,jj)*tmask(ji,jj,1)/(ht_0(ji,jj) + 1.0 - tmask(ji,jj,1)) )
+                     e3t_b(ji,jj,jk) = e3t_0(ji,jj,jk)*( 1._wp + sshb(ji,jj)*tmask(ji,jj,1)/(ht_0(ji,jj) + 1.0 - tmask(ji,jj,1)) )
+                  END DO
+               END DO
+            END DO
 !$OMP DO schedule(static) private(jk, jj, ji)
             DO jk = 1, jpk