Changeset 991 for branches/dev_003_CPL/NEMO/LIM_SRC_2/limthd_zdf_2.F90

Timestamp:

2008-05-23T17:55:55+02:00 (16 years ago)

Author:

smasson

Message:

dev_003_CPL: preliminary draft (not working), see ticket #155

File:

• branches/dev_003_CPL/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) (5 diffs)

branches/dev_003_CPL/NEMO/LIM_SRC_2/limthd_zdf_2.F90

@@ -213 +213 @@
           zghe     = ( 1.0 - zihe ) * zheshth * ( 2.0 - zheshth )   &
              &     +         zihe   * 0.5 * ( 1.5 + LOG( 2.0 * zheshth ) )
-#if defined key_lim_cp3
-          zghe = 1.0
-#endif 
 
           !---effective conductivities 
@@ -297 +294 @@
        DO ji = kideb, kiut
           !---computation of the derivative of energy balance function 
-#if defined key_coupled
-#   if defined key_lim_cp2
-          zdfts   =   zksndh(ji)   & ! contribution of the conductive heat flux
-             &      + zrcpdt(ji)   & ! contribution of hsu * rcp / dt
-             &      - dqns_ice_1d(ji)      ! contribution of the total non solar radiation 
-#   else
-          zdfts   =   zksndh(ji)   & ! contribution of the conductive heat flux
-             &      + zrcpdt(ji)    ! contribution of hsu * rcp / dt
-#   endif
-
-#else
           zdfts    =  zksndh(ji)   & ! contribution of the conductive heat flux
              &      + zrcpdt(ji)   & ! contribution of hsu * rcp / dt
              &      - dqns_ice_1d (ji)     ! contribution of the total non solar radiation 
-#endif
           !---computation of the energy balance function 
           zfts    = - z1mi0 (ji) * qsr_ice_1d(ji)   & ! net absorbed solar radiation
@@ -318 +303 @@
           !---computation of surface temperature increment  
           zdts    = -zfts / zdfts
-#if defined key_lim_cp3
-          zdts = zdts / 3.0
-#endif
           !---computation of the new surface temperature 
           sist_1d(ji) = sist_1d(ji) + zdts
@@ -340 +322 @@
        DO ji = kideb, kiut
           sist_1d(ji) = MIN( ztsmlt(ji) , sist_1d(ji) )
-#if ! defined key_coupled
-          qns_ice_1d(ji) = qns_ice_1d(ji) + dqns_ice_1d(ji) * ( sist_1d(ji) - zts_old(ji) )
-          qla_ice_1d (ji) = qla_ice_1d (ji) + dqla_ice_1d(ji) * ( sist_1d(ji) - zts_old(ji) )
-#endif
+          IF ( .NOT. lk_cpl ) THEN
+             qns_ice_1d(ji) = qns_ice_1d(ji) + dqns_ice_1d(ji) * ( sist_1d(ji) - zts_old(ji) )
+             qla_ice_1d(ji) = qla_ice_1d(ji) + dqla_ice_1d(ji) * ( sist_1d(ji) - zts_old(ji) )
+          ENDIF
           zfcsu(ji)  = zksndh(ji) * ( ztbif(ji) - sist_1d(ji) )
        END DO
@@ -542 +524 @@
           !-----------------------------------------------------------------------
           !----change in snow and ice thicknesses due to sublimation or evaporation
-          zdhssub  = parsub * ( qla_ice_1d(ji) / ( rhosn * xsn ) ) * rdt_ice 
+          IF ( .NOT. lk_cpl ) THEN 
+             zdhssub  = parsub * ( qla_ice_1d(ji) / ( rhosn * xsn ) ) * rdt_ice 
+          ELSE IF (parsub == 1) THEN 
+             CALL ctl_stop( 'In coupled mode, use parsub = 0 or send dqla' ) 
+          ELSE
+             zdhssub  = 0.0
+          ENDIF
           zhsn     = h_snow_1d(ji) - zdhssub
           zdhisub  = MAX( zzero , -zhsn ) * rhosn/rhoic