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

trunk/NEMO/LIM_SRC_3/limthd.F90

@@ -18 +18 @@
    USE ice             ! LIM sea-ice variables
    USE ice_oce         ! sea-ice/ocean variables
-   USE flx_oce         ! sea-ice/ocean forcings variables 
+   USE sbc_oce         ! Surface boundary condition: ocean fields
+   USE sbc_ice         ! Surface boundary condition: ice fields
    USE thd_ice         ! LIM thermodynamic sea-ice variables
    USE dom_ice         ! LIM sea-ice domain
@@ -52 +53 @@
    !!----------------------------------------------------------------------
    !!   LIM 2.0,  UCL-LOCEAN-IPSL (2005)
-   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/LIM_SRC/limthd.F90,v 1.6 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)
    !!----------------------------------------------------------------------
 
@@ -84 +85 @@
       !!---------------------------------------------------------------------
       !! * Local variables
-      INTEGER  ::  ji, jj, jk, jl,  &
-                   zji  , zjj,      &   ! dummy loop indices
-                   nbpb ,           &   ! nb of icy pts for thermo. cal.
-                   index
+      INTEGER  ::  ji, jj, jk, jl, nbpb   ! nb of icy pts for thermo. cal.
 
       REAL(wp) ::  &
@@ -211 +209 @@
 
             ! here the drag will depend on ice thickness and type (0.006)
-            fdtcn(ji,jj)  = zindb * rau0 * rcp * 0.006  * zfric_u * ( sst_io(ji,jj) - t_bo(ji,jj) ) 
+            fdtcn(ji,jj)  = zindb * rau0 * rcp * 0.006  * zfric_u * ( (sst_m(ji,jj) + rt0) - t_bo(ji,jj) ) 
             ! also category dependent
 !           !-- Energy from the turbulent oceanic heat flux heat flux coming in the lead 
@@ -220 +218 @@
 !           !-- Lead heat budget (part 1, next one is in limthd_dh
 !           !-- qldif -- (or qldif_1d in 1d routines)
-            zfontn         = sprecip(ji,jj) * lfus              !   energy of melting
-            zfnsol         = qnsr_oce(ji,jj)  !  total non solar flux
-            qldif(ji,jj)   = tms(ji,jj) * ( qsr_oce(ji,jj)                          &
+            zfontn         = sprecip(ji,jj) * lfus              ! energy of melting
+            zfnsol         = qns(ji,jj)                         ! total non solar flux
+            qldif(ji,jj)   = tms(ji,jj) * ( qsr(ji,jj)                              &
                &                               + zfnsol + fdtcn(ji,jj) - zfontn     &
                &                               + ( 1.0 - zindb ) * fsbbq(ji,jj) )   &
@@ -242 +240 @@
             ! Energy needed to bring ocean surface layer until its freezing
             ! qcmif, limflx
-            qcmif  (ji,jj) =  rau0 * rcp * fse3t(ji,jj,1) * ( t_bo(ji,jj) - sst_io(ji,jj) ) * ( 1. - zinda )
+            qcmif  (ji,jj) =  rau0 * rcp * fse3t(ji,jj,1) * ( t_bo(ji,jj) - (sst_m(ji,jj) + rt0) ) * ( 1. - zinda )
 
             !  calculate oceanic heat flux (limthd_dh)
@@ -271 +269 @@
                ENDIF
                ! debug point to follow
-               IF ( (ji.eq.jiindex).AND.(jj.eq.jjindex) ) THEN
+               IF ( (ji.eq.jiindx).AND.(jj.eq.jjindx) ) THEN
                    jiindex_1d = nbpb
                ENDIF
@@ -310 +308 @@
             CALL tab_2d_1d( nbpb, fr1_i0_1d  (1:nbpb)     , fr1_i0     , jpi, jpj, npb(1:nbpb) )
             CALL tab_2d_1d( nbpb, fr2_i0_1d  (1:nbpb)     , fr2_i0     , jpi, jpj, npb(1:nbpb) )
-            CALL tab_2d_1d( nbpb, qnsr_ice_1d(1:nbpb)     , qnsr_ice(:,:,jl)   , jpi, jpj, npb(1:nbpb) )
+            CALL tab_2d_1d( nbpb, qnsr_ice_1d(1:nbpb)     , qns_ice(:,:,jl) , jpi, jpj, npb(1:nbpb) )
 
 #if ! defined key_coupled
@@ -360 +358 @@
 
                                           !---------------------------------!
-            CALL lim_thd_sal(1,nbpb,jl)   ! Ice salinity computation        !
+            CALL lim_thd_sal(1,nbpb)      ! Ice salinity computation        !
                                           !---------------------------------!
 
@@ -415 +413 @@
             CALL tab_1d_2d( nbpb, s_i_newice , npb, s_i_new  (1:nbpb)      , jpi, jpj )
             CALL tab_1d_2d( nbpb, izero(:,:,jl) , npb, i0    (1:nbpb)      , jpi, jpj )
-            CALL tab_1d_2d( nbpb, qnsr_ice(:,:,jl), npb, qnsr_ice_1d(1:nbpb), jpi, jpj)
+            CALL tab_1d_2d( nbpb, qns_ice(:,:,jl), npb, qnsr_ice_1d(1:nbpb), jpi, jpj)
             !+++++
 
@@ -543 +541 @@
 
       INTEGER  :: &
-         ji,jj,jk            ! loop indices
+         ji,jk               ! loop indices
 
       !!-----------------------------------------------------------------------
@@ -598 +596 @@
                                        !  is violated
       INTEGER  :: &
-         ji,jj,jk,                  &  !: loop indices
+         ji,jk,                     &  !: loop indices
          zji, zjj
       !!---------------------------------------------------------------------
@@ -726 +724 @@
          WRITE(numout,*) ' foc        : ', fbif_1d(ji)
          WRITE(numout,*) ' fstroc     : ', fstroc   (zji,zjj,jl)
-         WRITE(numout,*) ' i0        : ', i0(ji)
-         WRITE(numout,*) ' fsolar     : ', (1.0-i0(ji))*qsr_ice_1d(ji)
-         WRITE(numout,*) ' fnsolar    : ', qnsr_ice_1d(ji)
+         WRITE(numout,*) ' i0         : ', i0(ji)
+         WRITE(numout,*) ' qsr_ice    : ', (1.0-i0(ji))*qsr_ice_1d(ji)
+         WRITE(numout,*) ' qns_ice    : ', qnsr_ice_1d(ji)
          WRITE(numout,*) ' Conduction fluxes : '
          WRITE(numout,*) ' fc_s      : ', fc_s(ji,0:nlay_s)
@@ -778 +776 @@
          numce                         !: number of points for which conservation
                                        !  is violated
-      INTEGER  :: &
-         ji,jj,jk,                  &  !: loop indices
-         zji, zjj
-
+      INTEGER  ::  ji, zji, zjj        ! loop indices
       !!---------------------------------------------------------------------