Changeset 14224
- Timestamp:
- 2020-12-19T15:49:56+01:00 (3 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml
r14146 r14224 183 183 <field id="heatc" long_name="Heat content vertically integrated" standard_name="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content" unit="J/m2" /> 184 184 <field id="saltc" long_name="Salt content vertically integrated" unit="1e-3*kg/m2" /> 185 <field id="saltc2" long_name="Salt content vertically integrated" unit="1e-3*kg/m2" > saltc * saltc </field > 185 186 186 187 <!-- EOS --> -
NEMO/trunk/src/OCE/DYN/dynatf.F90
r14143 r14224 121 121 INTEGER :: ji, jj, jk ! dummy loop indices 122 122 REAL(wp) :: zue3a, zue3n, zue3b, zcoef ! local scalars 123 REAL(wp) :: zve3a, zve3n, zve3b , z1_2dt! - -123 REAL(wp) :: zve3a, zve3n, zve3b ! - - 124 124 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zue, zve, zwfld 125 125 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zutau, zvtau … … 320 320 ENDIF 321 321 IF( l_trddyn ) THEN ! 3D output: asselin filter trends on momentum 322 zua(:,:,:) = ( puu(:,:,:,Kmm) - zua(:,:,:) ) * z1_2dt323 zva(:,:,:) = ( pvv(:,:,:,Kmm) - zva(:,:,:) ) * z1_2dt322 zua(:,:,:) = ( puu(:,:,:,Kmm) - zua(:,:,:) ) * r1_Dt 323 zva(:,:,:) = ( pvv(:,:,:,Kmm) - zva(:,:,:) ) * r1_Dt 324 324 CALL trd_dyn( zua, zva, jpdyn_atf, kt, Kmm ) 325 325 ENDIF -
NEMO/trunk/src/OCE/DYN/dynatf_qco.F90
r14143 r14224 98 98 INTEGER :: ji, jj, jk ! dummy loop indices 99 99 REAL(wp) :: zue3a, zue3n, zue3b, zcoef ! local scalars 100 REAL(wp) :: zve3a, zve3n, zve3b , z1_2dt! - -100 REAL(wp) :: zve3a, zve3n, zve3b ! - - 101 101 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zue, zve 102 102 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zua, zva … … 234 234 ENDIF 235 235 IF( l_trddyn ) THEN ! 3D output: asselin filter trends on momentum 236 zua(:,:,:) = ( puu(:,:,:,Kmm) - zua(:,:,:) ) * z1_2dt237 zva(:,:,:) = ( pvv(:,:,:,Kmm) - zva(:,:,:) ) * z1_2dt236 zua(:,:,:) = ( puu(:,:,:,Kmm) - zua(:,:,:) ) * r1_Dt 237 zva(:,:,:) = ( pvv(:,:,:,Kmm) - zva(:,:,:) ) * r1_Dt 238 238 CALL trd_dyn( zua, zva, jpdyn_atf, kt, Kmm ) 239 239 ENDIF -
NEMO/trunk/tests/CANAL/EXPREF/file_def_nemo-oce.xml
r13472 r14224 16 16 <field field_ref="ssh" /> 17 17 <field field_ref="socegrad" /> 18 <field field_ref=" eken_int" />18 <field field_ref="ke_int" /> 19 19 <field field_ref="relvor" /> 20 20 <field field_ref="potvor" /> -
NEMO/trunk/tests/CANAL/EXPREF/namelist_cfg
r14053 r14224 231 231 &namdyn_vor ! Vorticity / Coriolis scheme (default: NO selection) 232 232 !----------------------------------------------------------------------- 233 ln_dynvor_ene = .false. ! energy conserving scheme 234 ln_dynvor_ens = .false. ! enstrophy conserving scheme 235 ln_dynvor_mix = .false. ! mixed scheme 236 ln_dynvor_een = .false. ! energy & enstrophy scheme 237 r_enT = .false. ! energy conserving scheme (T-point) 238 ln_dynvor_eeT = .true. ! energy conserving scheme (een using e3t) 239 nn_e3f_typ = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1) 233 ln_dynvor_ene = .false. ! energy conserving scheme 234 ln_dynvor_ens = .false. ! enstrophy conserving scheme 235 ln_dynvor_mix = .false. ! mixed scheme 236 ln_dynvor_enT = .false. ! energy conserving scheme (T-point) 237 ln_dynvor_eeT = .true. ! energy conserving scheme (een using e3t) 238 ln_dynvor_een = .false. ! energy & enstrophy scheme 239 ! 240 nn_e3f_typ = 0 ! type of e3f (EEN, ENE, ENS, MIX only) =0 e3f = mi(mj(e3t))/4 241 ! ! =1 e3f = mi(mj(e3t))/mi(mj( tmask)) 240 242 / 241 243 !----------------------------------------------------------------------- -
NEMO/trunk/tests/CANAL/MY_SRC/usrdef_istate.F90
r14133 r14224 76 76 CASE(-1) ! stratif at rest 77 77 78 ! sea level:79 pssh(:,:) = 0.80 78 ! temperature: 81 79 pts(:,:,1,jp_tem) = 25. !!30._wp … … 146 144 ! salinity: 147 145 DO jk=1, jpkm1 148 pts(:,:,jk,jp_sal) = pssh(:,:)146 pts(:,:,jk,jp_sal) = gphit(:,:) 149 147 END DO 150 148 ! velocities:
Note: See TracChangeset
for help on using the changeset viewer.