- Timestamp:
- 2009-10-27T18:44:08+01:00 (15 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
CONFIG/GYRE/EXP00/iodef.xml (modified) (3 diffs)
-
CONFIG/GYRE_LOBSTER/EXP00/iodef.xml (modified) (3 diffs)
-
CONFIG/ORCA2_LIM/EXP00/iodef.xml (modified) (3 diffs)
-
CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml (modified) (3 diffs)
-
CONFIG/POMME/EXP00/iodef.xml (modified) (4 diffs)
-
NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CONFIG/GYRE/EXP00/iodef.xml
r1650 r1681 19 19 <field id="mldkz5" description="mixing layer depth (Turbocline)" unit="m" /> 20 20 <field id="mldr10_1" description="Mixed Layer Depth 0.01 ref.10m" unit="m" /> 21 <field id="bowl" description="Bowl Index" unit="W-point" />22 21 <!-- next variables available with key_diahth --> 23 22 <field id="mlddzt" description="Thermocline Depth (max dT/dz)" unit="m" /> 24 23 <field id="mldr10_3" description="Mixed Layer Depth dr=0.03 (ref.10m)" unit="m" /> 25 24 <field id="mldr0_1" description="Mixed Layer Depth dr=0.01 (ref.surf)" unit="m" /> 26 <field id="mldr0_ 1" description="Mixed Layer Depth dr=0.01(ref.surf)" unit="m" />25 <field id="mldr0_3" description="Mixed Layer Depth dr=0.03 (ref.surf)" unit="m" /> 27 26 <field id="mld|dt|" description="Mixed Layer Depth |dt|=0.2 (ref.10m)" unit="m" /> 28 27 <field id="topthdep" description="Top of the thermocline dt=-0.2 (ref.10m)" unit="m" /> … … 93 92 <field id="aht2d" description="lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 94 93 <field id="aht2d_eiv" description="EIV lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 94 <!-- avt_tide: available with key_zdftmx --> 95 <field id="av_tide" description="tidal vertical diffusivity" unit="m2/s" /> 95 96 </group> 96 97 … … 117 118 <field ref="qrp" name="sohefldp" /> 118 119 <field ref="erp" name="sowafldp" /> 119 <field ref=" bowl" name="sobowlin"/>120 <field ref="mldr10_1" name="sobowlin" operation="t_max(X)" /> 120 121 <field ref="mlddzt" name="sothedep" /> 121 122 <field ref="20d" name="so20chgt" /> -
trunk/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml
r1650 r1681 19 19 <field id="mldkz5" description="mixing layer depth (Turbocline)" unit="m" /> 20 20 <field id="mldr10_1" description="Mixed Layer Depth 0.01 ref.10m" unit="m" /> 21 <field id="bowl" description="Bowl Index" unit="W-point" />22 21 <!-- next variables available with key_diahth --> 23 22 <field id="mlddzt" description="Thermocline Depth (max dT/dz)" unit="m" /> 24 23 <field id="mldr10_3" description="Mixed Layer Depth dr=0.03 (ref.10m)" unit="m" /> 25 24 <field id="mldr0_1" description="Mixed Layer Depth dr=0.01 (ref.surf)" unit="m" /> 26 <field id="mldr0_ 1" description="Mixed Layer Depth dr=0.01(ref.surf)" unit="m" />25 <field id="mldr0_3" description="Mixed Layer Depth dr=0.03 (ref.surf)" unit="m" /> 27 26 <field id="mld|dt|" description="Mixed Layer Depth |dt|=0.2 (ref.10m)" unit="m" /> 28 27 <field id="topthdep" description="Top of the thermocline dt=-0.2 (ref.10m)" unit="m" /> … … 93 92 <field id="aht2d" description="lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 94 93 <field id="aht2d_eiv" description="EIV lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 94 <!-- avt_tide: available with key_zdftmx --> 95 <field id="av_tide" description="tidal vertical diffusivity" unit="m2/s" /> 95 96 </group> 96 97 … … 142 143 <field ref="qrp" name="sohefldp" /> 143 144 <field ref="erp" name="sowafldp" /> 144 <field ref=" bowl" name="sobowlin"/>145 <field ref="mldr10_1" name="sobowlin" operation="t_max(X)" /> 145 146 <field ref="mlddzt" name="sothedep" /> 146 147 <field ref="20d" name="so20chgt" /> -
trunk/CONFIG/ORCA2_LIM/EXP00/iodef.xml
r1650 r1681 19 19 <field id="mldkz5" description="mixing layer depth (Turbocline)" unit="m" /> 20 20 <field id="mldr10_1" description="Mixed Layer Depth 0.01 ref.10m" unit="m" /> 21 <field id="bowl" description="Bowl Index" unit="W-point" />22 21 <!-- next variables available with key_diahth --> 23 22 <field id="mlddzt" description="Thermocline Depth (max dT/dz)" unit="m" /> 24 23 <field id="mldr10_3" description="Mixed Layer Depth dr=0.03 (ref.10m)" unit="m" /> 25 24 <field id="mldr0_1" description="Mixed Layer Depth dr=0.01 (ref.surf)" unit="m" /> 26 <field id="mldr0_ 1" description="Mixed Layer Depth dr=0.01(ref.surf)" unit="m" />25 <field id="mldr0_3" description="Mixed Layer Depth dr=0.03 (ref.surf)" unit="m" /> 27 26 <field id="mld|dt|" description="Mixed Layer Depth |dt|=0.2 (ref.10m)" unit="m" /> 28 27 <field id="topthdep" description="Top of the thermocline dt=-0.2 (ref.10m)" unit="m" /> … … 128 127 <field id="aht2d" description="lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 129 128 <field id="aht2d_eiv" description="EIV lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 129 <!-- avt_tide: available with key_zdftmx --> 130 <field id="av_tide" description="tidal vertical diffusivity" unit="m2/s" /> 130 131 </group> 131 132 … … 152 153 <field ref="qrp" name="sohefldp" /> 153 154 <field ref="erp" name="sowafldp" /> 154 <field ref=" bowl" name="sobowlin"/>155 <field ref="mldr10_1" name="sobowlin" operation="t_max(X)" /> 155 156 <field ref="mlddzt" name="sothedep" /> 156 157 <field ref="20d" name="so20chgt" /> -
trunk/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
r1679 r1681 19 19 <field id="mldkz5" description="mixing layer depth (Turbocline)" unit="m" /> 20 20 <field id="mldr10_1" description="Mixed Layer Depth 0.01 ref.10m" unit="m" /> 21 <field id="bowl" description="Bowl Index" unit="W-point" />22 21 <!-- next variables available with key_diahth --> 23 22 <field id="mlddzt" description="Thermocline Depth (max dT/dz)" unit="m" /> 24 23 <field id="mldr10_3" description="Mixed Layer Depth dr=0.03 (ref.10m)" unit="m" /> 25 24 <field id="mldr0_1" description="Mixed Layer Depth dr=0.01 (ref.surf)" unit="m" /> 26 <field id="mldr0_ 1" description="Mixed Layer Depth dr=0.01(ref.surf)" unit="m" />25 <field id="mldr0_3" description="Mixed Layer Depth dr=0.03 (ref.surf)" unit="m" /> 27 26 <field id="mld|dt|" description="Mixed Layer Depth |dt|=0.2 (ref.10m)" unit="m" /> 28 27 <field id="topthdep" description="Top of the thermocline dt=-0.2 (ref.10m)" unit="m" /> … … 128 127 <field id="aht2d" description="lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 129 128 <field id="aht2d_eiv" description="EIV lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 129 <!-- avt_tide: available with key_zdftmx --> 130 <field id="av_tide" description="tidal vertical diffusivity" unit="m2/s" /> 130 131 </group> 131 132 … … 213 214 <field ref="qrp" name="sohefldp" /> 214 215 <field ref="erp" name="sowafldp" /> 215 <field ref=" bowl" name="sobowlin"/>216 <field ref="mldr10_1" name="sobowlin" operation="t_max(X)" /> 216 217 <field ref="mlddzt" name="sothedep" /> 217 218 <field ref="20d" name="so20chgt" /> -
trunk/CONFIG/POMME/EXP00/iodef.xml
r1647 r1681 1 <?xml version="1.0"?>1 x<?xml version="1.0"?> 2 2 3 3 <simulation> … … 19 19 <field id="mldkz5" description="mixing layer depth (Turbocline)" unit="m" /> 20 20 <field id="mldr10_1" description="Mixed Layer Depth 0.01 ref.10m" unit="m" /> 21 <field id="bowl" description="Bowl Index" unit="W-point" />22 21 <!-- next variables available with key_diahth --> 23 22 <field id="mlddzt" description="Thermocline Depth (max dT/dz)" unit="m" /> 24 23 <field id="mldr10_3" description="Mixed Layer Depth dr=0.03 (ref.10m)" unit="m" /> 25 24 <field id="mldr0_1" description="Mixed Layer Depth dr=0.01 (ref.surf)" unit="m" /> 26 <field id="mldr0_ 1" description="Mixed Layer Depth dr=0.01(ref.surf)" unit="m" />25 <field id="mldr0_3" description="Mixed Layer Depth dr=0.03 (ref.surf)" unit="m" /> 27 26 <field id="mld|dt|" description="Mixed Layer Depth |dt|=0.2 (ref.10m)" unit="m" /> 28 27 <field id="topthdep" description="Top of the thermocline dt=-0.2 (ref.10m)" unit="m" /> … … 92 91 <field id="aht2d" description="lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 93 92 <field id="aht2d_eiv" description="EIV lateral eddy diffusivity" unit="m2/s" axis_ref="none" /> 93 <!-- avt_tide: available with key_zdftmx --> 94 <field id="av_tide" description="tidal vertical diffusivity" unit="m2/s" /> 94 95 </group> 95 96 … … 115 116 <field ref="qrp" name="sohefldp" /> 116 117 <field ref="erp" name="sowafldp" /> 117 <field ref=" bowl" name="sobowlin"/>118 <field ref="mldr10_1" name="sobowlin" operation="t_max(X)" /> 118 119 <field ref="mlddzt" name="sothedep" /> 119 120 <field ref="20d" name="so20chgt" /> -
trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90
r1546 r1681 53 53 !! References : Lazar, A., these de l'universite Paris VI, France, 1997 54 54 !!---------------------------------------------------------------------- 55 USE oce, zav_evd => ua ! use ua as workspace 55 USE oce, zavt_evd => ua ! use ua as workspace 56 USE oce, zavm_evd => va ! use va as workspace 56 57 !! 57 58 INTEGER, INTENT( in ) :: kt ! ocean time-step indexocean time step … … 67 68 ENDIF 68 69 69 zav _evd(:,:,:) = avt(:,:,:) ! set avt prior to evd application70 zavt_evd(:,:,:) = avt(:,:,:) ! set avt prior to evd application 70 71 71 72 SELECT CASE ( nn_evdm ) 72 73 73 74 CASE ( 1 ) ! enhance vertical eddy viscosity and diffusivity (if rn2<-1.e-12) 75 76 zavm_evd(:,:,:) = avm(:,:,:) ! set avm prior to evd application 77 ! 74 78 DO jk = 1, jpkm1 75 79 #if defined key_vectopt_loop … … 99 103 CALL lbc_lnk( avmu, 'U', 1. ) ; CALL lbc_lnk( avmv, 'V', 1. ) 100 104 ! 105 zavm_evd(:,:,:) = avm(:,:,:) - zavm_evd(:,:,:) ! change in avm due to evd 106 CALL iom_put( "avm_evd", zavm_evd ) ! output this change 107 ! 101 108 CASE DEFAULT ! enhance vertical eddy diffusivity only (if rn2<-1.e-12) 102 109 DO jk = 1, jpkm1 … … 122 129 END SELECT 123 130 124 zav _evd(:,:,:) = avt(:,:,:) - zav_evd(:,:,:)! change in avt due to evd125 CALL iom_put( "avt_evd", zav _evd )! output this change131 zavt_evd(:,:,:) = avt(:,:,:) - zavt_evd(:,:,:) ! change in avt due to evd 132 CALL iom_put( "avt_evd", zavt_evd ) ! output this change 126 133 ! 127 134 END SUBROUTINE zdf_evd
Note: See TracChangeset
for help on using the changeset viewer.
