Changeset 1928

Timestamp:

2010-06-11T19:07:07+02:00 (14 years ago)

Author:

cetlod

Message:

bound the salt exchange at the Ice/Ocean? interface in the Baltic Sea ; generalisation for all ORCA configurations, see ticket:388

File:

• trunk/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (2 diffs)

trunk/NEMO/LIM_SRC_2/limsbc_2.F90

@@ -80 +80 @@
       INTEGER  ::   ifvt, i1mfr, idfr               ! some switches
       INTEGER  ::   iflt, ial, iadv, ifral, ifrdv
-      INTEGER  ::   ii0, ii1, ij0, ij1  ! temporary integers
       REAL(wp) ::   zrdtir           ! 1. / rdt_ice
       REAL(wp) ::   zqsr  , zqns     ! solar & non solar heat flux
@@ -109 +108 @@
          sice_r(:,:) = sice
          !
-         IF( cp_cfg == "orca"  .AND. jp_cfg == 2 ) THEN
-            !                                        ! =======================
-            !                                        !  ORCA_R2 configuration
-            !                                        ! =======================
-            ii0 = 145   ;   ii1 = 180        ! Baltic Sea
-            ij0 = 113   ;   ij1 = 130   ;   soce_r(mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 4.e0
-                                            sice_r(mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 2.e0
-         ENDIF
-         !
-      ENDIF
+         IF( cp_cfg == "orca" ) THEN
+           !   ocean/ice salinity in the Baltic sea 
+           DO jj = 1, jpj
+              DO ji = 1, jpi
+                 IF( glamt(ji,jj) >= 14. .AND.  glamt(ji,jj) <= 32. .AND. gphit(ji,jj) >= 54. .AND. gphit(ji,jj) <= 66. ) THEN 
+                   soce_r(ji,jj) = 4.e0 
+                   sice_r(ji,jj) = 2.e0
+                 END IF
+              END DO
+           END DO
+           !
+         END IF
+      END IF
 
       !------------------------------------------!