Changeset 888 for trunk/NEMO/LIM_SRC_3/limitd_me.F90

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

File:

• trunk/NEMO/LIM_SRC_3/limitd_me.F90 (modified) (7 diffs)

trunk/NEMO/LIM_SRC_3/limitd_me.F90

@@ -20 +20 @@
    USE phycst           ! physical constants (ocean directory) 
    USE ice_oce          ! ice variables
+   USE sbc_oce          ! Surface boundary condition: ocean fields
    USE thd_ice
    USE limistate
@@ -743 +744 @@
       ! Temporal smoothing
       !--------------------
-      IF ( numit .EQ. nit000 + nfice - 1 ) THEN
+      IF ( numit .EQ. nit000 + nn_fsbc - 1 ) THEN
          strp1(:,:) = 0.0            
          strp2(:,:) = 0.0            
@@ -1194 +1195 @@
       IF ( con_i ) THEN
          CALL lim_column_sum (jpl,   v_i, vice_init )
-         WRITE(numout,*) ' vice_init  : ', vice_init(jiindex,jjindex)
+         WRITE(numout,*) ' vice_init  : ', vice_init(jiindx,jjindx)
          CALL lim_column_sum_energy (jpl, nlay_i,  e_i, eice_init )
-         WRITE(numout,*) ' eice_init  : ', eice_init(jiindex,jjindex)
+         WRITE(numout,*) ' eice_init  : ', eice_init(jiindx,jjindx)
       ENDIF
 
@@ -1363 +1364 @@
             ! Salinity
             !-------------
-            smsw(ji,jj)       = sss_io(ji,jj) * vsw(ji,jj) * ridge_por 
+            smsw(ji,jj)       = sss_m(ji,jj) * vsw(ji,jj) * ridge_por 
 
             ! salinity of new ridge
@@ -1447 +1448 @@
                                         - eirft(ji,jj,jk)
             ! sea water heat content
-            ztmelts          = - tmut * sss_io(ji,jj) + rtt
+            ztmelts          = - tmut * sss_m(ji,jj) + rtt
             ! heat content per unit volume
-            zdummy0          = - rcp * ( sst_io(ji,jj) - rtt ) * vsw(ji,jj)
+            zdummy0          = - rcp * ( sst_m(ji,jj) + rt0 - rtt ) * vsw(ji,jj)
 
             ! corrected sea water salinity
@@ -1616 +1617 @@
          fieldid = ' v_i : limitd_me '
          CALL lim_cons_check (vice_init, vice_final, 1.0e-6, fieldid) 
-         WRITE(numout,*) ' vice_init  : ', vice_init(jiindex,jjindex)
-         WRITE(numout,*) ' vice_final : ', vice_final(jiindex,jjindex)
+         WRITE(numout,*) ' vice_init  : ', vice_init(jiindx,jjindx)
+         WRITE(numout,*) ' vice_final : ', vice_final(jiindx,jjindx)
 
          CALL lim_column_sum_energy (jpl, nlay_i,  e_i, eice_final )
          fieldid = ' e_i : limitd_me '
          CALL lim_cons_check (eice_init, eice_final, 1.0e-2, fieldid) 
-         WRITE(numout,*) ' eice_init  : ', eice_init(jiindex,jjindex)
-         WRITE(numout,*) ' eice_final : ', eice_final(jiindex,jjindex)
+         WRITE(numout,*) ' eice_init  : ', eice_init(jiindx,jjindx)
+         WRITE(numout,*) ' eice_final : ', eice_final(jiindx,jjindx)
       ENDIF
 
@@ -1839 +1840 @@
 !           fresh_hist(i,j) = fresh_hist(i,j) + xtmp
 
-!           fsalt_res(ji,jj)  = fsalt_res(ji,jj) + ( sss_io(ji,jj)                  ) * & 
+!           fsalt_res(ji,jj)  = fsalt_res(ji,jj) + ( sss_m(ji,jj)                  ) * & 
 !                               rhosn * v_s(ji,jj,jl) / rdt_ice
 
-!           fsalt_res(ji,jj)  = fsalt_res(ji,jj) + ( sss_io(ji,jj) - sm_i(ji,jj,jl) ) * & 
+!           fsalt_res(ji,jj)  = fsalt_res(ji,jj) + ( sss_m(ji,jj) - sm_i(ji,jj,jl) ) * & 
 !                               rhoic * v_i(ji,jj,jl) / rdt_ice
 
-!           fsalt(i,j)      = fsalt(i,j)      + xtmp
+!           emps(i,j)      = emps(i,j)      + xtmp
 !           fsalt_hist(i,j) = fsalt_hist(i,j) + xtmp