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/ICE/icestp.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/ICE/icestp.F90

    r11536 r12377  
    8686   PUBLIC   ice_init   ! called by sbcmod.F90 
    8787 
    88    !! * Substitutions 
    89 #  include "vectopt_loop_substitute.h90" 
    9088   !!---------------------------------------------------------------------- 
    9189   !! NEMO/ICE 4.0 , NEMO Consortium (2018) 
    … …  
    9593CONTAINS 
    9694 
    97    SUBROUTINE ice_stp( kt, ksbc ) 
     95   SUBROUTINE ice_stp( kt, Kbb, Kmm, ksbc ) 
    9896      !!--------------------------------------------------------------------- 
    9997      !!                  ***  ROUTINE ice_stp  *** 
    … …  
    115113      !!                utau, vtau, taum, wndm, qns , qsr, emp , sfx 
    116114      !!--------------------------------------------------------------------- 
    117       INTEGER, INTENT(in) ::   kt      ! ocean time step 
    118       INTEGER, INTENT(in) ::   ksbc    ! flux formulation (user defined, bulk, or Pure Coupled) 
     115      INTEGER, INTENT(in) ::   kt       ! ocean time step 
     116      INTEGER, INTENT(in) ::   Kbb, Kmm ! ocean time level indices 
     117      INTEGER, INTENT(in) ::   ksbc     ! flux formulation (user defined, bulk, or Pure Coupled) 
    119118      ! 
    120119      INTEGER ::   jl   ! dummy loop index 
    … …  
    160159         ! 
    161160         IF( ln_icedyn .AND. .NOT.lk_c1d )   & 
    162             &                           CALL ice_dyn( kt )            ! -- Ice dynamics 
     161            &                           CALL ice_dyn( kt, Kmm )       ! -- Ice dynamics 
    163162         ! 
    164163         !                          !==  lateral boundary conditions  ==! 
    … …  
    209208      ! --- Ocean time step --- ! 
    210209      !-------------------------! 
    211       IF( ln_icedyn )                   CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )   ! -- update surface ocean stresses 
     210      IF( ln_icedyn )                   CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )   ! -- update surface ocean stresses 
    212211!!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!! 
    213212      ! 
    … …  
    217216 
    218217 
    219    SUBROUTINE ice_init 
     218   SUBROUTINE ice_init( Kbb, Kmm, Kaa ) 
    220219      !!---------------------------------------------------------------------- 
    221220      !!                  ***  ROUTINE ice_init  *** 
    … …  
    223222      !! ** purpose :   Initialize sea-ice parameters 
    224223      !!---------------------------------------------------------------------- 
     224      INTEGER, INTENT(in) :: Kbb, Kmm, Kaa 
     225      ! 
    225226      INTEGER :: ji, jj, ierr 
    226227      !!---------------------------------------------------------------------- 
    … …  
    232233      IF(lwp) WRITE(numout,*) '~~~~~~~~' 
    233234      ! 
    234       !                                ! Open the reference and configuration namelist files and namelist output file 
    235       CALL ctl_opn( numnam_ice_ref, 'namelist_ice_ref',    'OLD',     'FORMATTED', 'SEQUENTIAL', -1, numout, lwp ) 
    236       CALL ctl_opn( numnam_ice_cfg, 'namelist_ice_cfg',    'OLD',     'FORMATTED', 'SEQUENTIAL', -1, numout, lwp ) 
    237       IF(lwm) CALL ctl_opn( numoni, 'output.namelist.ice', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, 1 ) 
     235      !                                ! Load the reference and configuration namelist files and open namelist output file 
     236      CALL load_nml( numnam_ice_ref, 'namelist_ice_ref',    numout, lwm ) 
     237      CALL load_nml( numnam_ice_cfg, 'namelist_ice_cfg',    numout, lwm ) 
     238      IF(lwm) CALL ctl_opn( numoni , 'output.namelist.ice', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, 1 ) 
    238239      ! 
    239240      CALL par_init                ! set some ice run parameters 
    … …  
    254255      IF( .NOT. ln_rstart ) THEN              ! start from rest: sea-ice deduced from sst 
    255256         CALL ice_istate_init 
    256          CALL ice_istate( nit000 ) 
     257         CALL ice_istate( nit000, Kbb, Kmm, Kaa ) 
    257258      ELSE                                    ! start from a restart file 
    258          CALL ice_rst_read 
     259         CALL ice_rst_read( Kbb, Kmm, Kaa ) 
    259260      ENDIF 
    260261      CALL ice_var_glo2eqv 
    … …  
    301302      !!------------------------------------------------------------------- 
    302303      ! 
    303       REWIND( numnam_ice_ref )      ! Namelist nampar in reference namelist : Parameters for ice 
    304304      READ  ( numnam_ice_ref, nampar, IOSTAT = ios, ERR = 901) 
    305305901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampar in reference namelist' ) 
    306       REWIND( numnam_ice_cfg )      ! Namelist nampar in configuration namelist : Parameters for ice 
    307306      READ  ( numnam_ice_cfg, nampar, IOSTAT = ios, ERR = 902 ) 
    308307902   IF( ios > 0 )   CALL ctl_nam ( ios , 'nampar in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.