Changeset 888 for trunk/NEMO/LIM_SRC_3/limthd_lac.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/limthd_lac.F90 (modified) (14 diffs)

trunk/NEMO/LIM_SRC_3/limthd_lac.F90

@@ -1 +1 @@
 MODULE limthd_lac
-#if defined key_lim3
    !!----------------------------------------------------------------------
    !!   'key_lim3'                                      LIM3 sea-ice model
@@ -8 +7 @@
    !!                lateral thermodynamic growth of the ice 
    !!======================================================================
-
+#if defined key_lim3
    !!----------------------------------------------------------------------
    !!   lim_lat_acr    : lateral accretion of ice
@@ -17 +16 @@
    USE phycst
    USE ice_oce         ! ice variables
+   USE sbc_oce         ! Surface boundary condition: ocean fields
+   USE sbc_ice         ! Surface boundary condition: ice fields
    USE thd_ice
    USE dom_ice
@@ -23 +24 @@
    USE iceini
    USE limtab
-   USE taumod
-   USE blk_oce
    USE limcons
      
@@ -46 +45 @@
    !!----------------------------------------------------------------------
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008) 
-   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/LIM_SRC/limthd_lac.F90,v 1.5 2005/03/27 18:34:42 opalod Exp $ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !! $ Id: $
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -181 +180 @@
          vt_s_init, vt_s_final,   &  !  snow volume summed over categories
          et_i_init, et_i_final,   &  !  ice energy summed over categories
-         et_s_init, et_s_final       !  snow energy summed over categories
+         et_s_init                   !  snow energy summed over categories
 
       REAL(wp) ::            &
@@ -267 +266 @@
             !-------------
             ! C-grid wind stress components
-            ztaux         = ( gtaux(ji-1,jj  ) * tmu(ji-1,jj  ) &
-                          +   gtaux(ji  ,jj  ) * tmu(ji  ,jj  ) ) / 2.0
-            ztauy         = ( gtauy(ji  ,jj-1) * tmv(ji  ,jj-1) &
-                          +   gtauy(ji  ,jj  ) * tmv(ji  ,jj  ) ) / 2.0
+            ztaux         = ( utaui_ice(ji-1,jj  ) * tmu(ji-1,jj  ) &
+                          +   utaui_ice(ji  ,jj  ) * tmu(ji  ,jj  ) ) / 2.0
+            ztauy         = ( vtaui_ice(ji  ,jj-1) * tmv(ji  ,jj-1) &
+                          +   vtaui_ice(ji  ,jj  ) * tmv(ji  ,jj  ) ) / 2.0
             ! Square root of wind stress
             ztenagm       =  SQRT( SQRT( ztaux * ztaux + ztauy * ztauy ) )
@@ -343 +342 @@
                nbpac = nbpac + 1
                npac( nbpac ) = (jj - 1) * jpi + ji
-               IF ( (ji.eq.jiindex).AND.(jj.eq.jjindex) ) THEN
+               IF ( (ji.eq.jiindx).AND.(jj.eq.jjindx) ) THEN
                   jiindex_1d = nbpac
                ENDIF
@@ -418 +417 @@
               zji            =   MOD( npac(ji) - 1, jpi ) + 1
               zjj            =   ( npac(ji) - 1 ) / jpi + 1
-              zs_newice(ji)  =   MIN( 0.5*sss_io(zji,zjj) , zs_newice(ji) )
+              zs_newice(ji)  =   MIN( 0.5*sss_m(zji,zjj) , zs_newice(ji) )
            END DO ! jl
 
@@ -476 +475 @@
               zjj            = ( npac(ji) - 1 ) / jpi + 1
               fseqv_1d(ji)   = fseqv_1d(ji) +                                     &
-                               ( sss_io(zji,zjj) - bulk_sal      ) * rhoic *      &
+                               ( sss_m(zji,zjj) - bulk_sal      ) * rhoic *       &
                                zv_newice(ji) / rdt_ice
            END DO
@@ -484 +483 @@
               zjj            = ( npac(ji) - 1 ) / jpi + 1
               fseqv_1d(ji)   = fseqv_1d(ji) +                                     &
-                               ( sss_io(zji,zjj) - zs_newice(ji) ) * rhoic *      &
+                               ( sss_m(zji,zjj) - zs_newice(ji) ) * rhoic *       &
                                zv_newice(ji) / rdt_ice
            END DO ! ji
@@ -617 +616 @@
         END DO
 
-        WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindex, 1:jpl)
+        WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindx, 1:jpl)
         DO jl = ice_cat_bounds(jm,1), ice_cat_bounds(jm,2)
            DO ji = 1, nbpac
@@ -626 +625 @@
            END DO ! ji
         END DO ! jl
-        WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindex, 1:jpl)
+        WRITE(numout,*) ' zv_i_ac : ', zv_i_ac(jiindx, 1:jpl)
 
         !---------------------------------
@@ -796 +795 @@
 !     CALL lim_cons_check (et_s_init, et_s_final, 1.0e-3, fieldid) 
 
-      WRITE(numout,*) ' vt_i_init : ', vt_i_init(jiindex,jjindex)
-      WRITE(numout,*) ' vt_i_final: ', vt_i_final(jiindex,jjindex)
-      WRITE(numout,*) ' et_i_init : ', et_i_init(jiindex,jjindex)
-      WRITE(numout,*) ' et_i_final: ', et_i_final(jiindex,jjindex)
+      WRITE(numout,*) ' vt_i_init : ', vt_i_init(jiindx,jjindx)
+      WRITE(numout,*) ' vt_i_final: ', vt_i_final(jiindx,jjindx)
+      WRITE(numout,*) ' et_i_init : ', et_i_init(jiindx,jjindx)
+      WRITE(numout,*) ' et_i_final: ', et_i_final(jiindx,jjindx)
 
       ENDIF