New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12377 for NEMO/trunk/src/OCE/OBS/diaobs.F90 – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge --ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The --ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/trunk/src/OCE/OBS/diaobs.F90

    r11536 r12377  
    103103CONTAINS 
    104104 
    105    SUBROUTINE dia_obs_init 
     105   SUBROUTINE dia_obs_init( Kmm ) 
    106106      !!---------------------------------------------------------------------- 
    107107      !!                    ***  ROUTINE dia_obs_init  *** 
     
    114114      !! 
    115115      !!---------------------------------------------------------------------- 
    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 
    117118      INTEGER, DIMENSION(:), ALLOCATABLE ::   ifilesprof, ifilessurf   ! Number of profile & surface files 
    118119      INTEGER :: ios             ! Local integer output status for namelist read 
     
    201202 
    202203      ! Read namelist namobs : control observation diagnostics 
    203       REWIND( numnam_ref )   ! Namelist namobs in reference namelist 
    204204      READ  ( numnam_ref, namobs, IOSTAT = ios, ERR = 901) 
    205205901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namobs in reference namelist' ) 
    206       REWIND( numnam_cfg )   ! Namelist namobs in configuration namelist 
    207206      READ  ( numnam_cfg, namobs, IOSTAT = ios, ERR = 902 ) 
    208207902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namobs in configuration namelist' ) 
     
    429428               &               jpi, jpj, jpk, & 
    430429               &               zmask1, zglam1, zgphi1, zmask2, zglam2, zgphi2,  & 
    431                &               ln_nea, ln_bound_reject, & 
     430               &               ln_nea, ln_bound_reject, Kmm, & 
    432431               &               kdailyavtypes = nn_profdavtypes ) 
    433432         END DO 
     
    459458            ! 
    460459            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 ) 
    462461               IF( ln_altbias )   & 
    463462                  & CALL obs_rea_altbias ( surfdataqc(jtype), n2dintsurf(jtype), cn_altbiasfile ) 
     
    483482 
    484483 
    485    SUBROUTINE dia_obs( kstp ) 
     484   SUBROUTINE dia_obs( kstp, Kmm ) 
    486485      !!---------------------------------------------------------------------- 
    487486      !!                    ***  ROUTINE dia_obs  *** 
     
    496495      !! ** Action  : 
    497496      !!---------------------------------------------------------------------- 
    498       USE dom_oce, ONLY : gdept_n, gdept_1d   ! Ocean space and time domain variables 
     497      USE dom_oce, ONLY : gdept, gdept_1d     ! Ocean space domain variables (Kmm time-level only) 
    499498      USE phycst , ONLY : rday                ! Physical constants 
    500       USE oce    , ONLY : tsn, un, vn, sshn   ! Ocean dynamics and tracers variables 
     499      USE oce    , ONLY : ts, uu, vv, ssh     ! Ocean dynamics and tracers variables (Kmm time-level only) 
    501500      USE phycst , ONLY : rday                ! Physical constants 
    502501#if defined  key_si3 
     
    511510      !! * Arguments 
    512511      INTEGER, INTENT(IN) :: kstp  ! Current timestep 
     512      INTEGER, INTENT(in) :: Kmm   ! ocean time level indices 
    513513      !! * Local declarations 
    514514      INTEGER :: idaystp           ! Number of timesteps per day 
     
    551551            SELECT CASE ( TRIM(cobstypesprof(jtype)) ) 
    552552            CASE('prof') 
    553                zprofvar1(:,:,:) = tsn(:,:,:,jp_tem) 
    554                zprofvar2(:,:,:) = tsn(:,:,:,jp_sal) 
     553               zprofvar1(:,:,:) = ts(:,:,:,jp_tem,Kmm) 
     554               zprofvar2(:,:,:) = ts(:,:,:,jp_sal,Kmm) 
    555555               zprofmask1(:,:,:) = tmask(:,:,:) 
    556556               zprofmask2(:,:,:) = tmask(:,:,:) 
     
    560560               zgphi2(:,:) = gphit(:,:) 
    561561            CASE('vel') 
    562                zprofvar1(:,:,:) = un(:,:,:) 
    563                zprofvar2(:,:,:) = vn(:,:,:) 
     562               zprofvar1(:,:,:) = uu(:,:,:,Kmm) 
     563               zprofvar2(:,:,:) = vv(:,:,:,Kmm) 
    564564               zprofmask1(:,:,:) = umask(:,:,:) 
    565565               zprofmask2(:,:,:) = vmask(:,:,:) 
     
    575575               &               nit000, idaystp,                         & 
    576576               &               zprofvar1, zprofvar2,                    & 
    577                &               gdept_n(:,:,:), gdepw_n(:,:,:),            &  
     577               &               gdept(:,:,:,Kmm), gdepw(:,:,:,Kmm),      &  
    578578               &               zprofmask1, zprofmask2,                  & 
    579579               &               zglam1, zglam2, zgphi1, zgphi2,          & 
     
    594594            SELECT CASE ( TRIM(cobstypessurf(jtype)) ) 
    595595            CASE('sst') 
    596                zsurfvar(:,:) = tsn(:,:,1,jp_tem) 
     596               zsurfvar(:,:) = ts(:,:,1,jp_tem,Kmm) 
    597597            CASE('sla') 
    598                zsurfvar(:,:) = sshn(:,:) 
     598               zsurfvar(:,:) = ssh(:,:,Kmm) 
    599599            CASE('sss') 
    600                zsurfvar(:,:) = tsn(:,:,1,jp_sal) 
     600               zsurfvar(:,:) = ts(:,:,1,jp_sal,Kmm) 
    601601            CASE('sic') 
    602602               IF ( kstp == 0 ) THEN 
Note: See TracChangeset for help on using the changeset viewer.