Ignore:
Timestamp:
2020-03-09T11:16:28+01:00 (9 months ago)
Author:
andmirek
Message:

Ticket 2386: fixes in the code

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

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r12377_ticket2386/src/OCE/IOM/in_out_manager.F90

    r12377 r12521  
    178178   LOGICAL       ::   lsp_area = .TRUE.     !: to make a control print over a specific area 
    179179   CHARACTER(lc) ::   cxios_context         !: context name used in xios 
    180    CHARACTER(lc) ::   crxios_context         !: context name used in xios to read restart 
     180   CHARACTER(lc) ::   crxios_context        !: context name used in xios to read restart 
    181181   CHARACTER(lc) ::   cwxios_context        !: context name used in xios to write restart file 
    182182 
  • NEMO/branches/2020/r12377_ticket2386/src/OCE/IOM/iom.F90

    r12515 r12521  
    478478        i = i + 1; fields(i)%vname="qsr_hc_b";       fields(i)%grid="grid_N_3D" 
    479479        i = i + 1; fields(i)%vname="fraqsr_1lev";    fields(i)%grid="grid_N" 
    480         i = i + 1; fields(i)%vname="greenland_icesheet_mass" 
    481                                                fields(i)%grid="grid_scalar" 
    482         i = i + 1; fields(i)%vname="greenland_icesheet_timelapsed" 
    483                                                fields(i)%grid="grid_scalar" 
    484         i = i + 1; fields(i)%vname="greenland_icesheet_mass_roc" 
    485                                                fields(i)%grid="grid_scalar" 
    486         i = i + 1; fields(i)%vname="antarctica_icesheet_mass" 
    487                                                fields(i)%grid="grid_scalar" 
    488         i = i + 1; fields(i)%vname="antarctica_icesheet_timelapsed" 
    489                                                fields(i)%grid="grid_scalar" 
    490         i = i + 1; fields(i)%vname="antarctica_icesheet_mass_roc" 
    491                                                fields(i)%grid="grid_scalar" 
    492480        i = i + 1; fields(i)%vname="frc_v";          fields(i)%grid="grid_scalar" 
    493481        i = i + 1; fields(i)%vname="frc_t";          fields(i)%grid="grid_scalar" 
     
    549537        i = i + 1; fields(i)%vname="hbli";           fields(i)%grid="grid_N" 
    550538        i = i + 1; fields(i)%vname="wn";             fields(i)%grid="grid_N_3D" 
     539        i = i + 1; fields(i)%vname="fwfisf_cav_b";   fields(i)%grid="grid_N" 
     540        i = i + 1; fields(i)%vname="isf_hc_cav_b";   fields(i)%grid="grid_N" 
     541        i = i + 1; fields(i)%vname="isf_sc_cav_b";   fields(i)%grid="grid_N" 
    551542 
    552543        IF( i-1 > max_rst_fields) THEN 
  • NEMO/branches/2020/r12377_ticket2386/src/OCE/IOM/iom_def.F90

    r12377 r12521  
    6767   END TYPE file_descriptor 
    6868   TYPE(file_descriptor), DIMENSION(jpmax_files), PUBLIC ::   iom_file !: array containing the info for all opened files 
    69    INTEGER, PARAMETER, PUBLIC                   :: max_rst_fields = 95 !: maximum number of restart variables defined in iom_set_rst_vars 
     69   INTEGER, PARAMETER, PUBLIC                   :: max_rst_fields = 105 !: maximum number of restart variables defined in iom_set_rst_vars 
    7070   TYPE, PUBLIC :: RST_FIELD   
    7171    CHARACTER(len=30) :: vname = "NO_NAME" ! names of variables in restart file 
  • NEMO/branches/2020/r12377_ticket2386/src/OCE/ISF/isfcav.F90

    r12511 r12521  
    183183      ! cavity mask 
    184184      mskisf_cav(:,:)    = (1._wp - tmask(:,:,1)) * ssmask(:,:) 
    185       ! 
    186       !================ 
    187       ! 2: read restart 
     185      !================ 
     186      ! 2: activate restart 
     187      !================ 
     188      ! 
     189      IF( lwxios ) THEN 
     190         CALL iom_set_rstw_var_active('fwfisf_cav_b') 
     191         CALL iom_set_rstw_var_active('isf_hc_cav_b') 
     192         CALL iom_set_rstw_var_active('isf_sc_cav_b') 
     193      ENDIF 
     194      ! 
     195      !================ 
     196      ! 3: read restart 
    188197      !================ 
    189198      ! 
Note: See TracChangeset for help on using the changeset viewer.