Changeset 6717 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

Timestamp:

2016-06-17T12:00:46+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: numerous improvement in the user defined interface

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (2 diffs)

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

@@ -449 +449 @@
       soce_0(:,:) = soce                     ! constant SSS and ice salinity used in levitating sea-ice case
       sice_0(:,:) = sice
-      !
-      IF( cp_cfg == "orca" ) THEN            ! decrease ocean & ice reference salinities in the Baltic sea 
-         WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.   &
-            &   54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp         ) 
-            soce_0(:,:) = 4._wp
-            sice_0(:,:) = 2._wp
-         END WHERE
-      ENDIF
+      !                                      ! decrease ocean & ice reference salinities in the Baltic sea 
+      WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.   &
+         &   54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp         ) 
+         soce_0(:,:) = 4._wp
+         sice_0(:,:) = 2._wp
+      END WHERE
       !                                      ! embedded sea ice
       IF( nn_ice_embd /= 0 ) THEN            ! mass exchanges between ice and ocean (case 1 or 2) set the snow+ice mass
@@ -473 +471 @@
 !!gm
          IF( .NOT.ln_linssh ) THEN
-
-            do jk = 1,jpkm1                     ! adjust initial vertical scale factors
+            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
+            END DO
             e3t_a(:,:,:) = e3t_b(:,:,:)
             ! Reconstruction of all vertical scale factors at now and before time steps