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 15305 – NEMO

Changeset 15305


Ignore:
Timestamp:
2021-09-30T17:06:33+02:00 (3 years ago)
Author:
jpalmier
Message:

fix conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals/src/OCE/ICB/icbrst.F90

    r15304 r15305  
    210210         IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/' 
    211211         WRITE(cl_kt, '(i8.8)') kt 
    212          cl_filename = TRIM(cexper)//"_"//cl_kt//"_restart_icebergs" 
     212         cl_filename = TRIM(cexper)//"_icebergs_"//cl_kt//"_restart" 
    213213         IF( lk_mpp ) THEN 
    214214            idg = MAX( INT(LOG10(REAL(MAX(1,jpnij-1),wp))) + 1, 4 )          ! how many digits to we need to write? min=4, max=9 
Note: See TracChangeset for help on using the changeset viewer.