Changeset 12515


Ignore:
Timestamp:
2020-03-05T15:47:11+01:00 (8 months ago)
Author:
andmirek
Message:

Ticket #2386 : changes in code to make XIOS restart read/write working in reference configurations

Location:
NEMO/branches/2020/r12377_ticket2386/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r12377_ticket2386/src/OCE/DOM/domain.F90

    r12511 r12515  
    115115         WRITE(numout,*)     '         cn_cfg = ', TRIM( cn_cfg ), '   nn_cfg = ', nn_cfg 
    116116      ENDIF 
    117       lwxios = .FALSE. 
     117      nn_wxios = 0 
    118118      ln_xios_read = .FALSE. 
    119119      ! 
  • NEMO/branches/2020/r12377_ticket2386/src/OCE/IOM/iom.F90

    r12511 r12515  
    119119      INTEGER ::   nldi_save, nlei_save    !:      and close boundaries in output files 
    120120      INTEGER ::   nldj_save, nlej_save    !: 
    121       LOGICAL ::   ll_closedef = .TRUE. 
     121      LOGICAL ::   ll_closedef 
    122122      !!---------------------------------------------------------------------- 
    123123      ! 
     
    134134         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
    135135      ENDIF 
     136      ! 
     137      ll_closedef = .TRUE. 
    136138      IF ( PRESENT(ld_closedef) ) ll_closedef = ld_closedef 
    137139      ! 
     
    364366           rst_file = TRIM(clpath)//TRIM(cn_ocerst_in) 
    365367        ELSE 
    366            rst_file = TRIM(clpath)//'1_'//TRIM(cn_ocerst_in) 
     368           rst_file = TRIM(clpath)//TRIM(Agrif_CFixed())//'_'//TRIM(cn_ocerst_in) 
    367369        ENDIF 
    368370!set name of the restart file and enable available fields 
    369         if(lwp) WRITE(numout,*) 'Setting restart filename (for XIOS) to: ',rst_file 
     371        if(lwp) WRITE(numout,*) 'Setting restart filename (for XIOS) to: ', TRIM(rst_file) 
    370372        CALL xios_get_handle("file_definition", filegroup_hdl ) 
    371373        CALL xios_add_child(filegroup_hdl, file_hdl, 'rrestart') 
     
    410412   IF(cdmdl == "OPA") THEN 
    411413!from restart.F90 
    412    CALL iom_set_rstw_var_active("rn_Dt") 
     414   CALL iom_set_rstw_var_active("rdt") 
    413415   IF ( .NOT. ln_diurnal_only ) THEN 
    414416        CALL iom_set_rstw_var_active('ub'  ) 
     
    448450 
    449451        i = 0 
    450         i = i + 1; fields(i)%vname="rn_Dt";            fields(i)%grid="grid_scalar" 
     452        i = i + 1; fields(i)%vname="rdt";            fields(i)%grid="grid_scalar" 
    451453        i = i + 1; fields(i)%vname="un";             fields(i)%grid="grid_N_3D" 
    452454        i = i + 1; fields(i)%vname="ub";             fields(i)%grid="grid_N_3D" 
Note: See TracChangeset for help on using the changeset viewer.