Changeset 826 for branches/dev_002_LIM/NEMO/C1D_SRC/diawri1d.F90

Timestamp:

2008-03-06T13:05:46+01:00 (16 years ago)

Author:

ctlod

Message:

dev_002_LIM: change remaining cpp key key_ice_lim into key_lim3, see ticket:#71

File:

• branches/dev_002_LIM/NEMO/C1D_SRC/diawri1d.F90 (modified) (6 diffs)

branches/dev_002_LIM/NEMO/C1D_SRC/diawri1d.F90

@@ -194 +194 @@
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
 
-#if ! defined key_dynspg_rl && defined key_ice_lim
+#if ! defined key_dynspg_rl && defined key_lim3
          ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to
          !    internal damping to Levitus that can be diagnosed from others
@@ -238 +238 @@
 #endif
 
-#if ( defined key_coupled && ! defined key_ice_lim ) 
+#if ( defined key_coupled && ! defined key_lim3 ) 
          CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping"         , "W/m2"   ,   &  ! qrp
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
@@ -260 +260 @@
 #endif
 
-#if defined key_ice_lim && defined key_coupled
+#if defined key_lim3 && defined key_coupled
          CALL histdef( nid_T,"soicetem" , "Ice Surface Temperature"            , "K"      ,   &  ! tn_ice
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
@@ -365 +365 @@
       CALL histwrite( nid_T, "sosstsst", it, tn(:,:,1)     , ndim_hT, ndex_hT )   ! sea surface temperature
       CALL histwrite( nid_T, "sosaline", it, sn(:,:,1)     , ndim_hT, ndex_hT )   ! sea surface salinity
-#if ! defined key_dynspg_rl && defined key_ice_lim
+#if ! defined key_dynspg_rl && defined key_lim3
       CALL histwrite( nid_T, "iowaflup", it, fsalt(:,:)    , ndim_hT, ndex_hT )   ! ice=>ocean water flux
       CALL histwrite( nid_T, "sowaflep", it, fmass(:,:)    , ndim_hT, ndex_hT )   ! atmos=>ocean water flux
@@ -397 +397 @@
       CALL histwrite( nid_T, "sosafldp", it, zw2d          , ndim_hT, ndex_hT )   ! salt flux damping
 #endif
-#if ( defined key_coupled && ! defined key_ice_lim ) 
+#if ( defined key_coupled && ! defined key_lim3 ) 
       CALL histwrite( nid_T, "sohefldp", it, qrp           , ndim_hT, ndex_hT )   ! heat flux damping
       CALL histwrite( nid_T, "sowafldp", it, erp           , ndim_hT, ndex_hT )   ! freshwater flux damping
@@ -412 +412 @@
       CALL histwrite( nid_T, "sohtc300", it, htc3          , ndim_hT, ndex_hT )   ! first 300m heaat content
 #endif
-#if defined key_ice_lim &&  defined key_coupled 
+#if defined key_lim3 &&  defined key_coupled 
       CALL histwrite( nid_T, "soicetem", it, tn_ice        , ndim_hT, ndex_hT )   ! surf. ice temperature
       CALL histwrite( nid_T, "soicealb", it, alb_ice       , ndim_hT, ndex_hT )   ! ice albedo