Changeset 886 for branches/dev_001_SBC/NEMO/LIM_SRC_3/limthd_lac.F90

Timestamp:

2008-04-11T11:24:17+02:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: Step II: adapt new SBC to LIM 3.0 component, see ticket: #112

File:

• branches/dev_001_SBC/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) (11 diffs)

branches/dev_001_SBC/NEMO/LIM_SRC_3/limthd_lac.F90

@@ -17 +17 @@
    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 +25 @@
    USE iceini
    USE limtab
-   USE taumod
-   USE blk_oce
    USE limcons
      
@@ -181 +181 @@
          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 +267 @@
             !-------------
             ! 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 +343 @@
                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 +418 @@
               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 +476 @@
               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 +484 @@
               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 +617 @@
         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 +626 @@
            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 +796 @@
 !     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