Changeset 12377 for NEMO/trunk/src/OCE/OBS/diaobs.F90
- Timestamp:
- 2020-02-12T15:39:06+01:00 (4 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEAD ext/AGRIF5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL
-
- Property svn:externals
-
NEMO/trunk/src/OCE/OBS/diaobs.F90
r11536 r12377 103 103 CONTAINS 104 104 105 SUBROUTINE dia_obs_init 105 SUBROUTINE dia_obs_init( Kmm ) 106 106 !!---------------------------------------------------------------------- 107 107 !! *** ROUTINE dia_obs_init *** … … 114 114 !! 115 115 !!---------------------------------------------------------------------- 116 INTEGER, PARAMETER :: jpmaxnfiles = 1000 ! Maximum number of files for each obs type 116 INTEGER, INTENT(in) :: Kmm ! ocean time level indices 117 INTEGER, PARAMETER :: jpmaxnfiles = 1000 ! Maximum number of files for each obs type 117 118 INTEGER, DIMENSION(:), ALLOCATABLE :: ifilesprof, ifilessurf ! Number of profile & surface files 118 119 INTEGER :: ios ! Local integer output status for namelist read … … 201 202 202 203 ! Read namelist namobs : control observation diagnostics 203 REWIND( numnam_ref ) ! Namelist namobs in reference namelist204 204 READ ( numnam_ref, namobs, IOSTAT = ios, ERR = 901) 205 205 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namobs in reference namelist' ) 206 REWIND( numnam_cfg ) ! Namelist namobs in configuration namelist207 206 READ ( numnam_cfg, namobs, IOSTAT = ios, ERR = 902 ) 208 207 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namobs in configuration namelist' ) … … 429 428 & jpi, jpj, jpk, & 430 429 & zmask1, zglam1, zgphi1, zmask2, zglam2, zgphi2, & 431 & ln_nea, ln_bound_reject, &430 & ln_nea, ln_bound_reject, Kmm, & 432 431 & kdailyavtypes = nn_profdavtypes ) 433 432 END DO … … 459 458 ! 460 459 IF( TRIM(cobstypessurf(jtype)) == 'sla' ) THEN 461 CALL obs_rea_mdt( surfdataqc(jtype), n2dintsurf(jtype) )460 CALL obs_rea_mdt( surfdataqc(jtype), n2dintsurf(jtype), Kmm ) 462 461 IF( ln_altbias ) & 463 462 & CALL obs_rea_altbias ( surfdataqc(jtype), n2dintsurf(jtype), cn_altbiasfile ) … … 483 482 484 483 485 SUBROUTINE dia_obs( kstp )484 SUBROUTINE dia_obs( kstp, Kmm ) 486 485 !!---------------------------------------------------------------------- 487 486 !! *** ROUTINE dia_obs *** … … 496 495 !! ** Action : 497 496 !!---------------------------------------------------------------------- 498 USE dom_oce, ONLY : gdept _n, gdept_1d ! Ocean space and time domain variables497 USE dom_oce, ONLY : gdept, gdept_1d ! Ocean space domain variables (Kmm time-level only) 499 498 USE phycst , ONLY : rday ! Physical constants 500 USE oce , ONLY : ts n, un, vn, sshn ! Ocean dynamics and tracers variables499 USE oce , ONLY : ts, uu, vv, ssh ! Ocean dynamics and tracers variables (Kmm time-level only) 501 500 USE phycst , ONLY : rday ! Physical constants 502 501 #if defined key_si3 … … 511 510 !! * Arguments 512 511 INTEGER, INTENT(IN) :: kstp ! Current timestep 512 INTEGER, INTENT(in) :: Kmm ! ocean time level indices 513 513 !! * Local declarations 514 514 INTEGER :: idaystp ! Number of timesteps per day … … 551 551 SELECT CASE ( TRIM(cobstypesprof(jtype)) ) 552 552 CASE('prof') 553 zprofvar1(:,:,:) = ts n(:,:,:,jp_tem)554 zprofvar2(:,:,:) = ts n(:,:,:,jp_sal)553 zprofvar1(:,:,:) = ts(:,:,:,jp_tem,Kmm) 554 zprofvar2(:,:,:) = ts(:,:,:,jp_sal,Kmm) 555 555 zprofmask1(:,:,:) = tmask(:,:,:) 556 556 zprofmask2(:,:,:) = tmask(:,:,:) … … 560 560 zgphi2(:,:) = gphit(:,:) 561 561 CASE('vel') 562 zprofvar1(:,:,:) = u n(:,:,:)563 zprofvar2(:,:,:) = v n(:,:,:)562 zprofvar1(:,:,:) = uu(:,:,:,Kmm) 563 zprofvar2(:,:,:) = vv(:,:,:,Kmm) 564 564 zprofmask1(:,:,:) = umask(:,:,:) 565 565 zprofmask2(:,:,:) = vmask(:,:,:) … … 575 575 & nit000, idaystp, & 576 576 & zprofvar1, zprofvar2, & 577 & gdept _n(:,:,:), gdepw_n(:,:,:),&577 & gdept(:,:,:,Kmm), gdepw(:,:,:,Kmm), & 578 578 & zprofmask1, zprofmask2, & 579 579 & zglam1, zglam2, zgphi1, zgphi2, & … … 594 594 SELECT CASE ( TRIM(cobstypessurf(jtype)) ) 595 595 CASE('sst') 596 zsurfvar(:,:) = ts n(:,:,1,jp_tem)596 zsurfvar(:,:) = ts(:,:,1,jp_tem,Kmm) 597 597 CASE('sla') 598 zsurfvar(:,:) = ssh n(:,:)598 zsurfvar(:,:) = ssh(:,:,Kmm) 599 599 CASE('sss') 600 zsurfvar(:,:) = ts n(:,:,1,jp_sal)600 zsurfvar(:,:) = ts(:,:,1,jp_sal,Kmm) 601 601 CASE('sic') 602 602 IF ( kstp == 0 ) THEN
Note: See TracChangeset
for help on using the changeset viewer.