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/FLO/flowri.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/FLO/flowri.F90

    r11818 r12377  
    5151   END FUNCTION flo_wri_alloc 
    5252 
    53    SUBROUTINE flo_wri( kt ) 
     53   SUBROUTINE flo_wri( kt, Kmm ) 
    5454      !!--------------------------------------------------------------------- 
    5555      !!                  ***  ROUTINE flo_wri *** 
     
    6464      !!---------------------------------------------------------------------- 
    6565      !! * Arguments 
    66       INTEGER  :: kt                               ! time step 
     66      INTEGER, INTENT(in)  :: kt                 ! time step 
     67      INTEGER, INTENT(in)  :: Kmm                ! time level index 
    6768 
    6869      !! * Local declarations 
     
    116117               zlon(jfl) = (1.-zafl)*(1.-zbfl)*glamt(iafloc ,ibfloc ) + (1.-zafl) * zbfl * glamt(iafloc ,ib1floc)   & 
    117118                     +     zafl *(1.-zbfl)*glamt(ia1floc,ibfloc ) +     zafl  * zbfl * glamt(ia1floc,ib1floc) 
    118                zdep(jfl) = (1.-zcfl)*gdepw_n(iafloc,ibfloc,icfl ) + zcfl * gdepw_n(iafloc,ibfloc,ic1fl)      
     119               zdep(jfl) = (1.-zcfl)*gdepw(iafloc,ibfloc,icfl ,Kmm) + zcfl * gdepw(iafloc,ibfloc,ic1fl,Kmm)      
    119120 
    120121               !save temperature, salinity and density at this position 
    121                ztem(jfl) = tsn(iafloc,ibfloc,icfl,jp_tem) 
    122                zsal (jfl) = tsn(iafloc,ibfloc,icfl,jp_sal) 
     122               ztem(jfl) = ts(iafloc,ibfloc,icfl,jp_tem,Kmm) 
     123               zsal (jfl) = ts(iafloc,ibfloc,icfl,jp_sal,Kmm) 
    123124               zrho (jfl) = (rhd(iafloc,ibfloc,icfl)+1)*rau0 
    124125 
     
    137138            zlon(jfl) = (1.-zafl)*(1.-zbfl)*glamt(iafloc ,ibfloc ) + (1.-zafl) * zbfl * glamt(iafloc ,ib1floc)   & 
    138139                      +     zafl *(1.-zbfl)*glamt(ia1floc,ibfloc ) +     zafl  * zbfl * glamt(ia1floc,ib1floc) 
    139             zdep(jfl) = (1.-zcfl)*gdepw_n(iafloc,ibfloc,icfl ) + zcfl * gdepw_n(iafloc,ibfloc,ic1fl) 
    140  
    141             ztem(jfl) = tsn(iafloc,ibfloc,icfl,jp_tem) 
    142             zsal(jfl) = tsn(iafloc,ibfloc,icfl,jp_sal) 
     140            zdep(jfl) = (1.-zcfl)*gdepw(iafloc,ibfloc,icfl ,Kmm) + zcfl * gdepw(iafloc,ibfloc,ic1fl,Kmm) 
     141 
     142            ztem(jfl) = ts(iafloc,ibfloc,icfl,jp_tem,Kmm) 
     143            zsal(jfl) = ts(iafloc,ibfloc,icfl,jp_sal,Kmm) 
    143144            zrho(jfl) = (rhd(iafloc,ibfloc,icfl)+1)*rau0 
    144145           
Note: See TracChangeset for help on using the changeset viewer.