Changeset 12472


Ignore:
Timestamp:
2020-02-26T17:37:57+01:00 (7 months ago)
Author:
mathiot
Message:

merge branch ticket1927 to trunk. merge of sette modification will follow

Location:
NEMO/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/cfgs/SHARED/namelist_ref

    r12377 r12472  
    576576   ln_icebergs = .false.      ! activate iceberg floats (force =F with "key_agrif") 
    577577   ! 
     578   !                          ! restart 
     579   cn_icbrst_in     = "restart_icb" !  suffix of iceberg restart name (input) 
     580   cn_icbrst_indir  = "./"          !  directory from which to read input ocean restarts 
     581   cn_icbrst_out    = "restart_icb" !  suffix of ocean restart name (output) 
     582   cn_icbrst_outdir = "./"          !  directory from which to read output ocean restarts           
     583   ! 
    578584   !                          ! diagnostics: 
    579585   ln_bergdia        = .true.        ! Calculate budgets 
  • NEMO/trunk/src/OCE/ICB/icb_oce.F90

    r10702 r12472  
    124124   LOGICAL , PUBLIC ::   ln_time_average_weight          !: Time average the weight on the ocean    !!gm I don't understand that ! 
    125125   REAL(wp), PUBLIC ::   rn_speed_limit                  !: CFL speed limit for a berg 
     126   ! 
     127   ! restart 
     128   CHARACTER(len=256), PUBLIC :: cn_icbrst_indir , cn_icbrst_in  !:  in: restart directory, restart name 
     129   CHARACTER(len=256), PUBLIC :: cn_icbrst_outdir, cn_icbrst_out !: out: restart directory, restart name 
    126130   ! 
    127131   !                                     ! Mass thresholds between iceberg classes [kg] 
  • NEMO/trunk/src/OCE/ICB/icbini.F90

    r12377 r12472  
    383383         &              rn_bits_erosion_fraction        , rn_sicn_shift       , ln_passive_mode      ,   & 
    384384         &              ln_time_average_weight          , nn_test_icebergs    , rn_test_box          ,   & 
    385          &              ln_use_calving , rn_speed_limit , cn_dir, sn_icb 
     385         &              ln_use_calving , rn_speed_limit , cn_dir, sn_icb      ,                          & 
     386         &              cn_icbrst_indir, cn_icbrst_in   , cn_icbrst_outdir    , cn_icbrst_out 
    386387      !!---------------------------------------------------------------------- 
    387388 
  • NEMO/trunk/src/OCE/ICB/icbrst.F90

    r11536 r12472  
    6969      TYPE(point)                  ::   localpt   ! NOT a pointer but an actual local variable 
    7070      !!---------------------------------------------------------------------- 
    71  
    7271      ! Find a restart file. Assume iceberg restarts in same directory as ocean restarts 
    7372      ! and are called TRIM(cn_ocerst)//'_icebergs' 
    74       cl_path = TRIM(cn_ocerst_indir) 
     73      cl_path = TRIM(cn_icbrst_indir) 
    7574      IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/' 
    76       cl_filename = TRIM(cn_ocerst_in)//'_icebergs' 
     75      cl_filename = TRIM(cn_icbrst_in) 
    7776      CALL iom_open( TRIM(cl_path)//cl_filename, ncid ) 
    7877 
     
    192191      CHARACTER(len=256)     :: cl_path 
    193192      CHARACTER(len=256)     :: cl_filename 
     193      CHARACTER(len=256)     :: cl_kt 
    194194      TYPE(iceberg), POINTER :: this 
    195195      TYPE(point)  , POINTER :: pt 
     
    204204         ! Only operate on the restart timestep itself. 
    205205         ! Assume we write iceberg restarts to same directory as ocean restarts. 
    206          cl_path = TRIM(cn_ocerst_outdir) 
     206         ! 
     207         ! directory name 
     208         cl_path = TRIM(cn_icbrst_outdir) 
    207209         IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/' 
     210         ! 
     211         ! file name 
     212         WRITE(cl_kt, '(i8.8)') kt 
     213         cl_filename = TRIM(cexper)//"_"//TRIM(ADJUSTL(cl_kt))//"_"//TRIM(cn_icbrst_out) 
    208214         IF( lk_mpp ) THEN 
    209             WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart_",I4.4,".nc")') TRIM(cexper), kt, narea-1 
     215            WRITE(cl_filename,'(A,"_",I4.4,".nc")') TRIM(cl_filename), narea-1 
    210216         ELSE 
    211             WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart.nc")') TRIM(cexper), kt 
     217            WRITE(cl_filename,'(A,".nc")') TRIM(cl_filename) 
    212218         ENDIF 
     219 
    213220         IF ( lwp .AND. nn_verbose_level >= 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',  & 
    214221           &                                                         TRIM(cl_path)//TRIM(cl_filename) 
Note: See TracChangeset for help on using the changeset viewer.