source: NEMO/trunk/src/TOP/PISCES/SED/sedmodel.F90 @ 12377

Last change on this file since 12377 was 12377, checked in by acc, 12 months ago

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.

  • Property svn:keywords set to Id
File size: 1.4 KB
Line 
1MODULE sedmodel
2   !!======================================================================
3   !!                       ***  MODULE sedmodel   ***
4   !!   Sediment model : Main routine of sediment model
5   !!======================================================================
6   USE sed
7   USE sedstp   ! time stepping
8   USE sedinitrc
9
10   IMPLICIT NONE
11   PRIVATE
12
13   !! * Routine accessibility
14   PUBLIC sed_model  ! called by step.F90
15
16CONTAINS
17
18   SUBROUTINE sed_model ( kt, Kbb, Kmm, Krhs )
19      !!---------------------------------------------------------------------
20      !!                  ***  ROUTINE sed_model  ***
21      !!
22      !! ** Purpose :   main routine of sediment model
23      !!
24      !!
25      !! ** Method  : - model general initialization
26      !!              - launch the time-stepping (stp routine)
27      !!
28      !!   History :
29      !!        !  07-02 (C. Ethe)  Original
30      !!----------------------------------------------------------------------
31      INTEGER, INTENT(in) ::   kt               ! number of iteration
32      INTEGER, INTENT(in) ::   Kbb, Kmm, Krhs   ! time level indices
33
34
35      IF( ln_timing )  CALL timing_start('sed_model')
36
37      IF( kt == nittrc000 ) CALL sed_initrc( Kbb, Kmm )         ! Initialization of sediment model
38                            CALL sed_stp( kt, Kbb, Kmm, Krhs )  ! Time stepping of Sediment model
39
40      IF( ln_timing )  CALL timing_stop('sed_model')
41
42   END SUBROUTINE sed_model
43
44END MODULE sedmodel
Note: See TracBrowser for help on using the repository browser.