Changeset 4792 for branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90

Timestamp:

2014-09-26T13:04:47+02:00 (10 years ago)

Author:

jamesharle

Message:

Updates to code after first successful test + merge with HEAD of trunk

File:

• branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 (modified) (7 diffs)

branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90

@@ -24 +24 @@
    USE par_ice_2
    USE ice_2           ! LIM_2 ice variables
+   USE dom_ice_2       ! sea-ice domain
 #elif defined key_lim3
    USE par_ice
    USE ice             ! LIM_3 ice variables
+   USE dom_ice         ! sea-ice domain
 #endif 
    USE par_oce         ! ocean parameters
    USE dom_oce         ! ocean space and time domain variables 
-   USE dom_ice          ! sea-ice domain
    USE sbc_oce         ! Surface boundary condition: ocean fields
    USE bdy_oce         ! ocean open boundary conditions
@@ -99 +100 @@
       REAL(wp) ::   zinda, ztmelts, zdh
 
-      REAL(wp), PARAMETER  ::   zsal = 6.3    ! arbitrary salinity    for incoming ice
-      REAL(wp), PARAMETER  ::   ztem = 270.0  ! arbitrary temperature for incoming ice
-      REAL(wp), PARAMETER  ::   zage = 30.0   ! arbitrary age         for incoming ice
       !!------------------------------------------------------------------------------
       !
@@ -233 +231 @@
 
                ! Ice salinity, age, temperature
-               sm_i(ji,jj,jl)   = zinda * zsal  + ( 1.0 - zinda ) * s_i_min
-               o_i(ji,jj,jl)    = zinda * zage  + ( 1.0 - zinda )
-               t_su(ji,jj,jl)   = zinda * ztem  + ( 1.0 - zinda ) * ztem
+               sm_i(ji,jj,jl)   = zinda * rn_ice_sal(ib_bdy)  + ( 1.0 - zinda ) * s_i_min
+               o_i(ji,jj,jl)    = zinda * rn_ice_age(ib_bdy)  + ( 1.0 - zinda )
+               t_su(ji,jj,jl)   = zinda * rn_ice_tem(ib_bdy)  + ( 1.0 - zinda ) * rn_ice_tem(ib_bdy)
                DO jk = 1, nlay_s
-                  t_s(ji,jj,jk,jl) = zinda * ztem + ( 1.0 - zinda ) * rtt
+                  t_s(ji,jj,jk,jl) = zinda * rn_ice_tem(ib_bdy) + ( 1.0 - zinda ) * rtt
                END DO
                DO jk = 1, nlay_i
-                  t_i(ji,jj,jk,jl) = zinda * ztem + ( 1.0 - zinda ) * rtt 
-                  s_i(ji,jj,jk,jl) = zinda * zsal + ( 1.0 - zinda ) * s_i_min
+                  t_i(ji,jj,jk,jl) = zinda * rn_ice_tem(ib_bdy) + ( 1.0 - zinda ) * rtt 
+                  s_i(ji,jj,jk,jl) = zinda * rn_ice_sal(ib_bdy) + ( 1.0 - zinda ) * s_i_min
                END DO
                
@@ -259 +257 @@
 
             END SELECT
+
+            ! if salinity is constant, then overwrite rn_ice_sal
+            IF( num_sal == 1 ) THEN
+               sm_i(ji,jj,jl)   = bulk_sal
+               s_i (ji,jj,:,jl) = bulk_sal
+            ENDIF
 
             ! contents
@@ -338 +342 @@
       DO ib_bdy=1, nb_bdy
          !
-         SELECT CASE( nn_ice_lim(ib_bdy) )
+         SELECT CASE( cn_ice_lim(ib_bdy) )
 
          CASE('none')
@@ -355 +359 @@
                   ji    = idx_bdy(ib_bdy)%nbi(jb,jgrd)
                   jj    = idx_bdy(ib_bdy)%nbj(jb,jgrd)
-                  zflag = idx_bdy(ib_bdy)%flagu(jb)
+                  zflag = idx_bdy(ib_bdy)%flagu(jb,jgrd)
                   
                   IF ( ABS( zflag ) == 1. ) THEN  ! eastern and western boundaries
@@ -384 +388 @@
                   ji    = idx_bdy(ib_bdy)%nbi(jb,jgrd)
                   jj    = idx_bdy(ib_bdy)%nbj(jb,jgrd)
-                  zflag = idx_bdy(ib_bdy)%flagv(jb)
+                  zflag = idx_bdy(ib_bdy)%flagv(jb,jgrd)
                   
                   IF ( ABS( zflag ) == 1. ) THEN  ! northern and southern boundaries