Changeset 881 for branches/dev_001_SBC/NEMO/OPA_SRC/DIA

Timestamp:

2008-04-08T11:45:52+02:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: Step I: change cpp ket name key_ice_lim into key_lim2 & change names inside modules with extension _2, see ticket: #110

Location:

branches/dev_001_SBC/NEMO/OPA_SRC/DIA

Files:

• diawri.F90 (modified) (6 diffs)
• diawri_dimg.h90 (modified) (2 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/DIA/diawri.F90

@@ -244 +244 @@
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
 #endif
-!!$#if ! defined key_dynspg_rl && defined key_ice_lim
+!!$#if ! defined key_dynspg_rl && defined key_lim2
 !!$         ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to
 !!$         !    internal damping to Levitus that can be diagnosed from others
@@ -282 +282 @@
 
 
-#if ( defined key_coupled && ! defined key_ice_lim ) 
+#if ( defined key_coupled && ! defined key_lim2 ) 
          CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping"         , "W/m2"   ,   &  ! qrp
             &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout )
@@ -308 +308 @@
 #endif
 
-#if defined key_ice_lim && defined key_coupled
+#if defined key_lim2 && 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 )
@@ -414 +414 @@
       CALL histwrite( nid_T, "sossheig", it, sshn          , ndim_hT, ndex_hT )   ! sea surface height
 #endif
-!!$#if ! defined key_dynspg_rl && defined key_ice_lim
+!!$#if ! defined key_dynspg_rl && defined key_lim2
 !!$      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
@@ -434 +434 @@
       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_lim2 ) 
       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
@@ -452 +452 @@
       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_lim2 &&  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

branches/dev_001_SBC/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -186 +186 @@
        !        fsel(:,:,15) = fsel(:,:,15) + fbt(:,:)
        fsel(:,:,16) = fsel(:,:,16) + emps(:,:)
-#if defined key_ice_lim
+#if defined key_lim2
        fsel(:,:,17) = fsel(:,:,17) + fsalt(:,:)
 #endif
@@ -276 +276 @@
           !         fsel(:,:,15) =  fbt(:,:)
           fsel(:,:,16) =  emps(:,:) * tmask(:,:,1)
-#if defined key_ice_lim
+#if defined key_lim2
           fsel(:,:,17) =  fsalt(:,:) * tmask(:,:,1)
 #endif