Changeset 7523
- Timestamp:
- 2017-01-03T11:06:57+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r7522 r7523 52 52 PUBLIC dta_dyn_swp ! called by step.F90 53 53 54 CHARACTER(len=100) :: cn_dir !: Root directory for location of ssr files 55 LOGICAL :: ln_dynrnf !: read runoff data in file (T) or set to zero (F) 56 LOGICAL :: ln_dynrnf_depth !: read runoff data in file (T) or set to zero (F) 54 CHARACTER(len=100) :: cn_dir !: Root directory for location of ssr files 55 LOGICAL :: ln_ssh_ini !: initial ssh from dyn file (T) or not (F) - ssh is then read from passive tracer restart 56 LOGICAL :: ln_dynrnf !: read runoff data in file (T) or set to zero (F) 57 LOGICAL :: ln_dynrnf_depth !: read runoff data in file (T) or set to zero (F) 57 58 REAL(wp) :: fwbcorr 58 59 … … 231 232 !!---------------------------------------------------------------------- 232 233 233 NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth, fwbcorr, &234 NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth, ln_ssh_ini, fwbcorr, & 234 235 & sn_uwd, sn_vwd, sn_wwd, sn_emp, & 235 236 & sn_avt, sn_tem, sn_sal, sn_mld , sn_qsr , & … … 253 254 WRITE(numout,*) '~~~~~~~ ' 254 255 WRITE(numout,*) ' Namelist namdta_dyn' 256 WRITE(numout,*) ' ssh initialised from dyn file (T) or not (F) ln_ssh_ini = ', ln_ssh_ini 255 257 WRITE(numout,*) ' runoffs option enabled (T) or not (F) ln_dynrnf = ', ln_dynrnf 256 258 WRITE(numout,*) ' runoffs is spread in vertical ln_dynrnf_depth = ', ln_dynrnf_depth … … 279 281 ! 280 282 IF( lk_trabbl ) THEN 281 jf_ubl = jfld + 1 ; jf_vbl = jfld + 2 ; jfld = jf_vbl283 jf_ubl = jfld + 1 ; jf_vbl = jfld + 2 ; jfld = jf_vbl 282 284 slf_d(jf_ubl) = sn_ubl ; slf_d(jf_vbl) = sn_vbl 283 285 ENDIF … … 329 331 ! 330 332 IF( lk_vvl ) THEN 331 IF( .NOT. sf_dyn(jf_uwd)%ln_clim .AND. ln_rsttr .AND. & ! Restart: read in restart file 332 iom_varid( numrtr, 'sshn', ldstop = .FALSE. ) > 0 ) THEN 333 IF(lwp) WRITE(numout,*) ' sshn forcing fields read in the restart file for initialisation' 334 CALL iom_get( numrtr, jpdom_autoglo, 'sshn', sshn(:,:) ) 335 CALL iom_get( numrtr, jpdom_autoglo, 'sshb', sshb(:,:) ) 336 ELSE 337 IF(lwp) WRITE(numout,*) ' sshn forcing fields read in the restart file for initialisation' 333 IF( ln_ssh_ini ) THEN ! Restart: read in restart file 334 IF(lwp) WRITE(numout,*) ' sshn forcing fields read in the dynamics restart file for initialisation' 338 335 CALL iom_open( 'restart', inum ) 339 336 CALL iom_get( inum, jpdom_autoglo, 'sshn', sshn(:,:) ) 340 337 CALL iom_get( inum, jpdom_autoglo, 'sshb', sshb(:,:) ) 341 338 CALL iom_close( inum ) ! close file 339 ELSE 340 IF(lwp) WRITE(numout,*) ' sshn forcing fields read in passive tracers restart file for initialisation' 341 CALL iom_get( numrtr, jpdom_autoglo, 'sshn', sshn(:,:) ) 342 CALL iom_get( numrtr, jpdom_autoglo, 'sshb', sshb(:,:) ) 342 343 ENDIF 343 344 !
Note: See TracChangeset
for help on using the changeset viewer.