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/DIA/dia25h.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/DIA/dia25h.F90

    r11536 r12377  
    3939CONTAINS 
    4040 
    41    SUBROUTINE dia_25h_init  
     41   SUBROUTINE dia_25h_init( Kbb ) 
    4242      !!--------------------------------------------------------------------------- 
    4343      !!                  ***  ROUTINE dia_25h_init  *** 
    … …  
    4747      !! ** Method : Read namelist 
    4848      !!--------------------------------------------------------------------------- 
     49      INTEGER, INTENT(in) :: Kbb       ! Time level index 
     50      ! 
    4951      INTEGER ::   ios                 ! Local integer output status for namelist read 
    5052      INTEGER ::   ierror              ! Local integer for memory allocation 
    … …  
    5355      !!---------------------------------------------------------------------- 
    5456      ! 
    55       REWIND ( numnam_ref )              ! Read Namelist nam_dia25h in reference namelist : 25hour mean diagnostics 
    5657      READ   ( numnam_ref, nam_dia25h, IOSTAT=ios, ERR= 901 ) 
    5758901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nam_dia25h in reference namelist' ) 
    58       REWIND( numnam_cfg )              ! Namelist nam_dia25h in configuration namelist  25hour diagnostics 
    5959      READ  ( numnam_cfg, nam_dia25h, IOSTAT = ios, ERR = 902 ) 
    6060902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nam_dia25h in configuration namelist' ) 
    … …  
    9595      ! ------------------------- ! 
    9696      cnt_25h = 1  ! sets the first value of sum at timestep 1 (note - should strictly be at timestep zero so before values used where possible)  
    97       tn_25h  (:,:,:) = tsb (:,:,:,jp_tem) 
    98       sn_25h  (:,:,:) = tsb (:,:,:,jp_sal) 
    99       sshn_25h(:,:)   = sshb(:,:) 
    100       un_25h  (:,:,:) = ub  (:,:,:) 
    101       vn_25h  (:,:,:) = vb  (:,:,:) 
     97      tn_25h  (:,:,:) = ts (:,:,:,jp_tem,Kbb) 
     98      sn_25h  (:,:,:) = ts (:,:,:,jp_sal,Kbb) 
     99      sshn_25h(:,:)   = ssh(:,:,Kbb) 
     100      un_25h  (:,:,:) = uu  (:,:,:,Kbb) 
     101      vn_25h  (:,:,:) = vv  (:,:,:,Kbb) 
    102102      avt_25h (:,:,:) = avt (:,:,:) 
    103103      avm_25h (:,:,:) = avm (:,:,:) 
    … …  
    116116 
    117117 
    118    SUBROUTINE dia_25h( kt )   
     118   SUBROUTINE dia_25h( kt, Kmm )   
    119119      !!---------------------------------------------------------------------- 
    120120      !!                 ***  ROUTINE dia_25h  *** 
    … …  
    125125      !!---------------------------------------------------------------------- 
    126126      INTEGER, INTENT(in) ::   kt   ! ocean time-step index 
     127      INTEGER, INTENT(in) ::   Kmm  ! ocean time level index 
    127128      !! 
    128129      INTEGER ::   ji, jj, jk 
    … …  
    150151      ! wn_25h could not be initialised in dia_25h_init, so we do it here instead 
    151152      IF( kt == nn_it000 ) THEN 
    152          wn_25h(:,:,:) = wn(:,:,:) 
     153         wn_25h(:,:,:) = ww(:,:,:) 
    153154      ENDIF 
    154155 
    … …  
    161162         ENDIF 
    162163 
    163          tn_25h  (:,:,:)     = tn_25h  (:,:,:) + tsn (:,:,:,jp_tem) 
    164          sn_25h  (:,:,:)     = sn_25h  (:,:,:) + tsn (:,:,:,jp_sal) 
    165          sshn_25h(:,:)       = sshn_25h(:,:)   + sshn(:,:) 
    166          un_25h  (:,:,:)     = un_25h  (:,:,:) + un  (:,:,:) 
    167          vn_25h  (:,:,:)     = vn_25h  (:,:,:) + vn  (:,:,:) 
    168          wn_25h  (:,:,:)     = wn_25h  (:,:,:) + wn  (:,:,:) 
     164         tn_25h  (:,:,:)     = tn_25h  (:,:,:) + ts (:,:,:,jp_tem,Kmm) 
     165         sn_25h  (:,:,:)     = sn_25h  (:,:,:) + ts (:,:,:,jp_sal,Kmm) 
     166         sshn_25h(:,:)       = sshn_25h(:,:)   + ssh(:,:,Kmm) 
     167         un_25h  (:,:,:)     = un_25h  (:,:,:) + uu  (:,:,:,Kmm) 
     168         vn_25h  (:,:,:)     = vn_25h  (:,:,:) + vv  (:,:,:,Kmm) 
     169         wn_25h  (:,:,:)     = wn_25h  (:,:,:) + ww  (:,:,:) 
    169170         avt_25h (:,:,:)     = avt_25h (:,:,:) + avt (:,:,:) 
    170171         avm_25h (:,:,:)     = avm_25h (:,:,:) + avm (:,:,:) 
    … …  
    245246         ! 
    246247         ! After the write reset the values to cnt=1 and sum values equal current value  
    247          tn_25h  (:,:,:) = tsn (:,:,:,jp_tem) 
    248          sn_25h  (:,:,:) = tsn (:,:,:,jp_sal) 
    249          sshn_25h(:,:)   = sshn(:,:) 
    250          un_25h  (:,:,:) = un  (:,:,:) 
    251          vn_25h  (:,:,:) = vn  (:,:,:) 
    252          wn_25h  (:,:,:) = wn  (:,:,:) 
     248         tn_25h  (:,:,:) = ts (:,:,:,jp_tem,Kmm) 
     249         sn_25h  (:,:,:) = ts (:,:,:,jp_sal,Kmm) 
     250         sshn_25h(:,:)   = ssh(:,:,Kmm) 
     251         un_25h  (:,:,:) = uu  (:,:,:,Kmm) 
     252         vn_25h  (:,:,:) = vv  (:,:,:,Kmm) 
     253         wn_25h  (:,:,:) = ww  (:,:,:) 
    253254         avt_25h (:,:,:) = avt (:,:,:) 
    254255         avm_25h (:,:,:) = avm (:,:,:) 
Note: See TracChangeset for help on using the changeset viewer.