Changeset 8668
- Timestamp:
- 2017-10-30T12:44:29+01:00 (7 years ago)
- Location:
- branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO
- Files:
-
- 20 edited
-
OPA_SRC/DIA/diahsb.F90 (modified) (1 diff)
-
OPA_SRC/DOM/daymod.F90 (modified) (2 diffs)
-
OPA_SRC/DOM/domvvl.F90 (modified) (6 diffs)
-
OPA_SRC/DOM/iscplrst.F90 (modified) (1 diff)
-
OPA_SRC/DYN/dynspg_ts.F90 (modified) (1 diff)
-
OPA_SRC/IOM/in_out_manager.F90 (modified) (1 diff)
-
OPA_SRC/IOM/iom.F90 (modified) (20 diffs)
-
OPA_SRC/IOM/restart.F90 (modified) (2 diffs)
-
OPA_SRC/SBC/sbcapr.F90 (modified) (1 diff)
-
OPA_SRC/SBC/sbcisf.F90 (modified) (1 diff)
-
OPA_SRC/SBC/sbcmod.F90 (modified) (1 diff)
-
OPA_SRC/SBC/sbcrnf.F90 (modified) (1 diff)
-
OPA_SRC/SBC/sbcssm.F90 (modified) (1 diff)
-
OPA_SRC/TRA/traqsr.F90 (modified) (2 diffs)
-
OPA_SRC/TRA/trasbc.F90 (modified) (1 diff)
-
OPA_SRC/ZDF/zdfgls.F90 (modified) (1 diff)
-
OPA_SRC/ZDF/zdfini.F90 (modified) (1 diff)
-
OPA_SRC/ZDF/zdftke.F90 (modified) (1 diff)
-
OPA_SRC/step.F90 (modified) (1 diff)
-
SAS_SRC/daymod.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
r8612 r8668 256 256 IF(lwp) WRITE(numout,*) ' dia_hsb_rst at it= ', kt,' date= ', ndastp 257 257 IF(lwp) WRITE(numout,*) '~~~~~~~' 258 CALL iom_get( numror, 'frc_v', frc_v, l rxios = lxios_read )259 CALL iom_get( numror, 'frc_t', frc_t, l rxios = lxios_read )260 CALL iom_get( numror, 'frc_s', frc_s, l rxios = lxios_read )258 CALL iom_get( numror, 'frc_v', frc_v, ldxios = lxios_read ) 259 CALL iom_get( numror, 'frc_t', frc_t, ldxios = lxios_read ) 260 CALL iom_get( numror, 'frc_s', frc_s, ldxios = lxios_read ) 261 261 IF( ln_linssh ) THEN 262 CALL iom_get( numror, 'frc_wn_t', frc_wn_t, l rxios = lxios_read )263 CALL iom_get( numror, 'frc_wn_s', frc_wn_s, l rxios = lxios_read )262 CALL iom_get( numror, 'frc_wn_t', frc_wn_t, ldxios = lxios_read ) 263 CALL iom_get( numror, 'frc_wn_s', frc_wn_s, ldxios = lxios_read ) 264 264 ENDIF 265 CALL iom_get( numror, jpdom_autoglo, 'surf_ini', surf_ini, l rxios = lxios_read ) ! ice sheet coupling266 CALL iom_get( numror, jpdom_autoglo, 'ssh_ini', ssh_ini(:,:), l rxios = lxios_read )267 CALL iom_get( numror, jpdom_autoglo, 'e3t_ini', e3t_ini(:,:,:), l rxios = lxios_read )268 CALL iom_get( numror, jpdom_autoglo, 'hc_loc_ini', hc_loc_ini(:,:,:), l rxios = lxios_read )269 CALL iom_get( numror, jpdom_autoglo, 'sc_loc_ini', sc_loc_ini(:,:,:), l rxios = lxios_read )265 CALL iom_get( numror, jpdom_autoglo, 'surf_ini', surf_ini, ldxios = lxios_read ) ! ice sheet coupling 266 CALL iom_get( numror, jpdom_autoglo, 'ssh_ini', ssh_ini(:,:), ldxios = lxios_read ) 267 CALL iom_get( numror, jpdom_autoglo, 'e3t_ini', e3t_ini(:,:,:), ldxios = lxios_read ) 268 CALL iom_get( numror, jpdom_autoglo, 'hc_loc_ini', hc_loc_ini(:,:,:), ldxios = lxios_read ) 269 CALL iom_get( numror, jpdom_autoglo, 'sc_loc_ini', sc_loc_ini(:,:,:), ldxios = lxios_read ) 270 270 IF( ln_linssh ) THEN 271 CALL iom_get( numror, jpdom_autoglo, 'ssh_hc_loc_ini', ssh_hc_loc_ini(:,:), l rxios = lxios_read )272 CALL iom_get( numror, jpdom_autoglo, 'ssh_sc_loc_ini', ssh_sc_loc_ini(:,:), l rxios = lxios_read )271 CALL iom_get( numror, jpdom_autoglo, 'ssh_hc_loc_ini', ssh_hc_loc_ini(:,:), ldxios = lxios_read ) 272 CALL iom_get( numror, jpdom_autoglo, 'ssh_sc_loc_ini', ssh_sc_loc_ini(:,:), ldxios = lxios_read ) 273 273 ENDIF 274 274 ELSE -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90
r8612 r8668 319 319 IF( iom_varid( numror, 'kt', ldstop = .FALSE. ) > 0 ) THEN 320 320 ! Get Calendar informations 321 CALL iom_get( numror, 'kt', zkt, l rxios = lxios_read ) ! last time-step of previous run321 CALL iom_get( numror, 'kt', zkt, ldxios = lxios_read ) ! last time-step of previous run 322 322 IF(lwp) THEN 323 323 WRITE(numout,*) ' *** Info read in restart : ' … … 338 338 IF ( nrstdt == 2 ) THEN 339 339 ! read the parameters corresponding to nit000 - 1 (last time step of previous run) 340 CALL iom_get( numror, 'ndastp', zndastp, l rxios = lxios_read )340 CALL iom_get( numror, 'ndastp', zndastp, ldxios = lxios_read ) 341 341 ndastp = NINT( zndastp ) 342 CALL iom_get( numror, 'adatrj', adatrj, l rxios = lxios_read )343 CALL iom_get( numror, 'ntime', ktime, l rxios = lxios_read )342 CALL iom_get( numror, 'adatrj', adatrj, ldxios = lxios_read ) 343 CALL iom_get( numror, 'ntime', ktime, ldxios = lxios_read ) 344 344 nn_time0=INT(ktime) 345 345 ! calculate start time in hours and minutes -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r8612 r8668 800 800 IF( ln_rstart ) THEN !* Read the restart file 801 801 CALL rst_read_open ! open the restart file if necessary 802 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn, l rxios = lxios_read )802 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn, ldxios = lxios_read ) 803 803 ! 804 804 id1 = iom_varid( numror, 'e3t_b', ldstop = .FALSE. ) … … 811 811 ! ! --------- ! 812 812 IF( MIN( id1, id2 ) > 0 ) THEN ! all required arrays exist 813 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:), l rxios = lxios_read )814 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:), l rxios = lxios_read )813 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:), ldxios = lxios_read ) 814 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:), ldxios = lxios_read ) 815 815 ! needed to restart if land processor not computed 816 816 IF(lwp) write(numout,*) 'dom_vvl_rst : e3t_b and e3t_n found in restart files' … … 826 826 IF(lwp) write(numout,*) 'e3t_n set equal to e3t_b.' 827 827 IF(lwp) write(numout,*) 'neuler is forced to 0' 828 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:), l rxios = lxios_read )828 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:), ldxios = lxios_read ) 829 829 e3t_n(:,:,:) = e3t_b(:,:,:) 830 830 neuler = 0 … … 833 833 IF(lwp) write(numout,*) 'e3t_b set equal to e3t_n.' 834 834 IF(lwp) write(numout,*) 'neuler is forced to 0' 835 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:), l rxios = lxios_read )835 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:), ldxios = lxios_read ) 836 836 e3t_b(:,:,:) = e3t_n(:,:,:) 837 837 neuler = 0 … … 858 858 ! ! ----------------------- ! 859 859 IF( MIN( id3, id4 ) > 0 ) THEN ! all required arrays exist 860 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_b', tilde_e3t_b(:,:,:), l rxios = lxios_read )861 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_n', tilde_e3t_n(:,:,:), l rxios = lxios_read )860 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_b', tilde_e3t_b(:,:,:), ldxios = lxios_read ) 861 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_n', tilde_e3t_n(:,:,:), ldxios = lxios_read ) 862 862 ELSE ! one at least array is missing 863 863 tilde_e3t_b(:,:,:) = 0.0_wp … … 868 868 ! ! ------------ ! 869 869 IF( id5 > 0 ) THEN ! required array exists 870 CALL iom_get( numror, jpdom_autoglo, 'hdiv_lf', hdiv_lf(:,:,:), l rxios = lxios_read )870 CALL iom_get( numror, jpdom_autoglo, 'hdiv_lf', hdiv_lf(:,:,:), ldxios = lxios_read ) 871 871 ELSE ! array is missing 872 872 hdiv_lf(:,:,:) = 0.0_wp -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90
r8612 r8668 65 65 66 66 !! get restart variable 67 CALL iom_get( numror, jpdom_autoglo, 'tmask' , ztmask_b, l rxios = lxios_read ) ! need to extrapolate T/S68 CALL iom_get( numror, jpdom_autoglo, 'umask' , zumask_b, l rxios = lxios_read ) ! need to correct barotropic velocity69 CALL iom_get( numror, jpdom_autoglo, 'vmask' , zvmask_b, l rxios = lxios_read ) ! need to correct barotropic velocity70 CALL iom_get( numror, jpdom_autoglo, 'smask' , zsmask_b, l rxios = lxios_read ) ! need to correct barotropic velocity71 CALL iom_get( numror, jpdom_autoglo, 'e3t_n' , ze3t_b(:,:,:), l rxios = lxios_read ) ! need to compute temperature correction72 CALL iom_get( numror, jpdom_autoglo, 'e3u_n' , ze3u_b(:,:,:), l rxios = lxios_read ) ! need to correct barotropic velocity73 CALL iom_get( numror, jpdom_autoglo, 'e3v_n' , ze3v_b(:,:,:), l rxios = lxios_read ) ! need to correct barotropic velocity74 CALL iom_get( numror, jpdom_autoglo, 'gdepw_n', zdepw_b(:,:,:), l rxios = lxios_read ) ! need to interpol vertical profile (vvl)67 CALL iom_get( numror, jpdom_autoglo, 'tmask' , ztmask_b, ldxios = lxios_read ) ! need to extrapolate T/S 68 CALL iom_get( numror, jpdom_autoglo, 'umask' , zumask_b, ldxios = lxios_read ) ! need to correct barotropic velocity 69 CALL iom_get( numror, jpdom_autoglo, 'vmask' , zvmask_b, ldxios = lxios_read ) ! need to correct barotropic velocity 70 CALL iom_get( numror, jpdom_autoglo, 'smask' , zsmask_b, ldxios = lxios_read ) ! need to correct barotropic velocity 71 CALL iom_get( numror, jpdom_autoglo, 'e3t_n' , ze3t_b(:,:,:), ldxios = lxios_read ) ! need to compute temperature correction 72 CALL iom_get( numror, jpdom_autoglo, 'e3u_n' , ze3u_b(:,:,:), ldxios = lxios_read ) ! need to correct barotropic velocity 73 CALL iom_get( numror, jpdom_autoglo, 'e3v_n' , ze3v_b(:,:,:), ldxios = lxios_read ) ! need to correct barotropic velocity 74 CALL iom_get( numror, jpdom_autoglo, 'gdepw_n', zdepw_b(:,:,:), ldxios = lxios_read ) ! need to interpol vertical profile (vvl) 75 75 76 76 !! read namelist -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r8612 r8668 1199 1199 ! 1200 1200 IF( TRIM(cdrw) == 'READ' ) THEN 1201 CALL iom_get( numror, jpdom_autoglo, 'ub2_b' , ub2_b (:,:), l rxios = lxios_read )1202 CALL iom_get( numror, jpdom_autoglo, 'vb2_b' , vb2_b (:,:), l rxios = lxios_read )1201 CALL iom_get( numror, jpdom_autoglo, 'ub2_b' , ub2_b (:,:), ldxios = lxios_read ) 1202 CALL iom_get( numror, jpdom_autoglo, 'vb2_b' , vb2_b (:,:), ldxios = lxios_read ) 1203 1203 IF( .NOT.ln_bt_av ) THEN 1204 CALL iom_get( numror, jpdom_autoglo, 'sshbb_e' , sshbb_e(:,:), l rxios = lxios_read )1205 CALL iom_get( numror, jpdom_autoglo, 'ubb_e' , ubb_e(:,:), l rxios = lxios_read )1206 CALL iom_get( numror, jpdom_autoglo, 'vbb_e' , vbb_e(:,:), l rxios = lxios_read )1207 CALL iom_get( numror, jpdom_autoglo, 'sshb_e' , sshb_e(:,:), l rxios = lxios_read )1208 CALL iom_get( numror, jpdom_autoglo, 'ub_e' , ub_e(:,:), l rxios = lxios_read )1209 CALL iom_get( numror, jpdom_autoglo, 'vb_e' , vb_e(:,:), l rxios = lxios_read )1204 CALL iom_get( numror, jpdom_autoglo, 'sshbb_e' , sshbb_e(:,:), ldxios = lxios_read ) 1205 CALL iom_get( numror, jpdom_autoglo, 'ubb_e' , ubb_e(:,:), ldxios = lxios_read ) 1206 CALL iom_get( numror, jpdom_autoglo, 'vbb_e' , vbb_e(:,:), ldxios = lxios_read ) 1207 CALL iom_get( numror, jpdom_autoglo, 'sshb_e' , sshb_e(:,:), ldxios = lxios_read ) 1208 CALL iom_get( numror, jpdom_autoglo, 'ub_e' , ub_e(:,:), ldxios = lxios_read ) 1209 CALL iom_get( numror, jpdom_autoglo, 'vb_e' , vb_e(:,:), ldxios = lxios_read ) 1210 1210 ENDIF 1211 1211 #if defined key_agrif 1212 1212 ! Read time integrated fluxes 1213 1213 IF ( .NOT.Agrif_Root() ) THEN 1214 CALL iom_get( numror, jpdom_autoglo, 'ub2_i_b' , ub2_i_b(:,:), l rxios = lxios_read )1215 CALL iom_get( numror, jpdom_autoglo, 'vb2_i_b' , vb2_i_b(:,:), l rxios = lxios_read )1214 CALL iom_get( numror, jpdom_autoglo, 'ub2_i_b' , ub2_i_b(:,:), ldxios = lxios_read ) 1215 CALL iom_get( numror, jpdom_autoglo, 'vb2_i_b' , vb2_i_b(:,:), ldxios = lxios_read ) 1216 1216 ENDIF 1217 1217 #endif -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90
r8612 r8668 151 151 LOGICAL :: lsp_area = .TRUE. !: to make a control print over a specific area 152 152 CHARACTER(lc) :: cxios_context !: context name used in xios 153 CHARACTER(lc) :: rxios_context !: context name used in xios to read restart153 CHARACTER(lc) :: crxios_context !: context name used in xios to read restart 154 154 155 155 !!---------------------------------------------------------------------- -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r8616 r8668 106 106 CHARACTER(len=10) :: clname 107 107 INTEGER :: ji, jkmin 108 LOGICAL :: l rst_context ! is context related to restart108 LOGICAL :: llrst_context ! is context related to restart 109 109 ! 110 110 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zt_bnds, zw_bnds … … 117 117 CALL xios_context_initialize(TRIM(clname), mpi_comm_opa) 118 118 CALL iom_swap( cdname ) 119 l rst_context = (TRIM(cdname) == TRIM(rxios_context))119 llrst_context = (TRIM(cdname) == TRIM(crxios_context)) 120 120 121 121 ! Calendar type is now defined in xml file … … 130 130 131 131 ! horizontal grid definition 132 IF(.NOT.l rst_context) CALL set_scalar132 IF(.NOT.llrst_context) CALL set_scalar 133 133 134 134 IF( TRIM(cdname) == TRIM(cxios_context) ) THEN … … 162 162 CALL dom_grid_glo ! Return to parent grid domain 163 163 ! 164 IF( ln_cfmeta .AND. TRIM(cdname) .NE. TRIM( rxios_context)) THEN ! Add additional grid metadata164 IF( ln_cfmeta .AND. TRIM(cdname) .NE. TRIM(crxios_context)) THEN ! Add additional grid metadata 165 165 CALL iom_set_domain_attr("grid_T", area = e1e2t_crs(nldi:nlei, nldj:nlej)) 166 166 CALL iom_set_domain_attr("grid_U", area = e1u_crs(nldi:nlei, nldj:nlej) * e2u_crs(nldi:nlei, nldj:nlej)) … … 175 175 176 176 ! vertical grid definition 177 IF(.NOT.l rst_context) THEN177 IF(.NOT.llrst_context) THEN 178 178 CALL iom_set_axis_attr( "deptht", paxis = gdept_1d ) 179 179 CALL iom_set_axis_attr( "depthu", paxis = gdept_1d ) … … 206 206 ENDIF 207 207 ! automatic definitions of some of the xml attributs 208 IF( l rst_context ) THEN208 IF( llrst_context ) THEN 209 209 !set names of the fields in restart file IF using XIOS to read/write data 210 210 CALL set_rst_context() … … 724 724 !! INTERFACE iom_get 725 725 !!---------------------------------------------------------------------- 726 SUBROUTINE iom_g0d( kiomid, cdvar, pvar, ktime, l rxios )726 SUBROUTINE iom_g0d( kiomid, cdvar, pvar, ktime, ldxios ) 727 727 INTEGER , INTENT(in ) :: kiomid ! Identifier of the file 728 728 CHARACTER(len=*), INTENT(in ) :: cdvar ! Name of the variable 729 729 REAL(wp) , INTENT( out) :: pvar ! read field 730 730 INTEGER , INTENT(in ), OPTIONAL :: ktime ! record number 731 LOGICAL , INTENT(in ), OPTIONAL :: l rxios ! use xios to read restart731 LOGICAL , INTENT(in ), OPTIONAL :: ldxios ! use xios to read restart 732 732 ! 733 733 INTEGER :: idvar ! variable id … … 737 737 CHARACTER(LEN=100) :: clname ! file name 738 738 CHARACTER(LEN=1) :: cldmspc ! 739 LOGICAL :: l xios740 ! 741 l xios = .FALSE.742 IF( PRESENT(l rxios) ) lxios = lrxios743 744 IF(.NOT.l xios) THEN ! read data using default library739 LOGICAL :: llxios 740 ! 741 llxios = .FALSE. 742 IF( PRESENT(ldxios) ) llxios = ldxios 743 744 IF(.NOT.llxios) THEN ! read data using default library 745 745 itime = 1 746 746 IF( PRESENT(ktime) ) itime = ktime … … 767 767 ELSE 768 768 IF(lwp) WRITE(numout,*) 'XIOS RST READ (0D): ', trim(cdvar) 769 CALL iom_swap( TRIM( rxios_context) )769 CALL iom_swap( TRIM(crxios_context) ) 770 770 CALL xios_recv_field( trim(cdvar), pvar) 771 771 CALL iom_swap( TRIM(cxios_context) ) … … 773 773 END SUBROUTINE iom_g0d 774 774 775 SUBROUTINE iom_g1d( kiomid, kdom, cdvar, pvar, ktime, kstart, kcount, l rxios )775 SUBROUTINE iom_g1d( kiomid, kdom, cdvar, pvar, ktime, kstart, kcount, ldxios ) 776 776 INTEGER , INTENT(in ) :: kiomid ! Identifier of the file 777 777 INTEGER , INTENT(in ) :: kdom ! Type of domain to be read … … 781 781 INTEGER , INTENT(in ), DIMENSION(1), OPTIONAL :: kstart ! start axis position of the reading 782 782 INTEGER , INTENT(in ), DIMENSION(1), OPTIONAL :: kcount ! number of points in each axis 783 LOGICAL , INTENT(in ), OPTIONAL :: l rxios ! read data using XIOS783 LOGICAL , INTENT(in ), OPTIONAL :: ldxios ! read data using XIOS 784 784 ! 785 785 IF( kiomid > 0 ) THEN 786 786 IF( iom_file(kiomid)%nfid > 0 ) CALL iom_get_123d( kiomid, kdom , cdvar , pv_r1d=pvar, & 787 787 & ktime=ktime, kstart=kstart, kcount=kcount, & 788 & l rxios=lrxios )788 & ldxios=ldxios ) 789 789 ENDIF 790 790 END SUBROUTINE iom_g1d 791 791 792 SUBROUTINE iom_g2d( kiomid, kdom, cdvar, pvar, ktime, kstart, kcount, lrowattr, l rxios)792 SUBROUTINE iom_g2d( kiomid, kdom, cdvar, pvar, ktime, kstart, kcount, lrowattr, ldxios) 793 793 INTEGER , INTENT(in ) :: kiomid ! Identifier of the file 794 794 INTEGER , INTENT(in ) :: kdom ! Type of domain to be read … … 802 802 ! called open_ocean_jstart to set the start 803 803 ! value for the 2nd dimension (netcdf only) 804 LOGICAL , INTENT(in ), OPTIONAL :: l rxios ! read data using XIOS804 LOGICAL , INTENT(in ), OPTIONAL :: ldxios ! read data using XIOS 805 805 ! 806 806 IF( kiomid > 0 ) THEN 807 807 IF( iom_file(kiomid)%nfid > 0 ) CALL iom_get_123d( kiomid, kdom , cdvar , pv_r2d=pvar, & 808 808 & ktime=ktime, kstart=kstart, kcount=kcount, & 809 & lrowattr=lrowattr, l rxios=lrxios)809 & lrowattr=lrowattr, ldxios=ldxios) 810 810 ENDIF 811 811 END SUBROUTINE iom_g2d 812 812 813 SUBROUTINE iom_g3d( kiomid, kdom, cdvar, pvar, ktime, kstart, kcount, lrowattr, l rxios )813 SUBROUTINE iom_g3d( kiomid, kdom, cdvar, pvar, ktime, kstart, kcount, lrowattr, ldxios ) 814 814 INTEGER , INTENT(in ) :: kiomid ! Identifier of the file 815 815 INTEGER , INTENT(in ) :: kdom ! Type of domain to be read … … 823 823 ! called open_ocean_jstart to set the start 824 824 ! value for the 2nd dimension (netcdf only) 825 LOGICAL , INTENT(in ), OPTIONAL :: l rxios ! read data using XIOS825 LOGICAL , INTENT(in ), OPTIONAL :: ldxios ! read data using XIOS 826 826 ! 827 827 IF( kiomid > 0 ) THEN 828 828 IF( iom_file(kiomid)%nfid > 0 ) CALL iom_get_123d( kiomid, kdom , cdvar , pv_r3d=pvar, & 829 829 & ktime=ktime, kstart=kstart, kcount=kcount, & 830 & lrowattr=lrowattr, l rxios=lrxios )830 & lrowattr=lrowattr, ldxios=ldxios ) 831 831 ENDIF 832 832 END SUBROUTINE iom_g3d … … 836 836 & pv_r1d, pv_r2d, pv_r3d, & 837 837 & ktime , kstart, kcount, & 838 & lrowattr, l rxios )838 & lrowattr, ldxios ) 839 839 !!----------------------------------------------------------------------- 840 840 !! *** ROUTINE iom_get_123d *** … … 857 857 ! called open_ocean_jstart to set the start 858 858 ! value for the 2nd dimension (netcdf only) 859 LOGICAL , INTENT(in ), OPTIONAL :: l rxios ! use XIOS to read restart860 ! 861 LOGICAL :: l xios ! local definition for XIOS read859 LOGICAL , INTENT(in ), OPTIONAL :: ldxios ! use XIOS to read restart 860 ! 861 LOGICAL :: llxios ! local definition for XIOS read 862 862 LOGICAL :: llnoov ! local definition to read overlap 863 863 LOGICAL :: luse_jattr ! local definition to read open_ocean_jstart file attribute … … 887 887 ! 888 888 REAL(wp) :: gma, gmi 889 l xios = .FALSE.890 if(PRESENT(l rxios)) lxios = lrxios889 llxios = .FALSE. 890 if(PRESENT(ldxios)) llxios = ldxios 891 891 idvar = iom_varid( kiomid, cdvar ) 892 892 idom = kdom 893 893 894 IF(.NOT.l xios) THEN894 IF(.NOT.llxios) THEN 895 895 clname = iom_file(kiomid)%name ! esier to read 896 896 clinfo = ' iom_get_123d, file: '//trim(clname)//', var: '//trim(cdvar) … … 1123 1123 #if defined key_iomput 1124 1124 !would be good to be able to check which context is active and swap only if current is not restart 1125 CALL iom_swap( TRIM( rxios_context) )1125 CALL iom_swap( TRIM(crxios_context) ) 1126 1126 IF( PRESENT(pv_r3d) ) THEN 1127 1127 if(lwp) write(numout,*) 'XIOS RST READ (3D): ',trim(cdvar) … … 1626 1626 1627 1627 1628 SUBROUTINE set_grid( cdgrd, plon, plat, l xios )1628 SUBROUTINE set_grid( cdgrd, plon, plat, ldxios ) 1629 1629 !!---------------------------------------------------------------------- 1630 1630 !! *** ROUTINE set_grid *** … … 1639 1639 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zmask 1640 1640 INTEGER :: ni,nj 1641 LOGICAL, INTENT(IN) :: l xios1641 LOGICAL, INTENT(IN) :: ldxios 1642 1642 1643 1643 ni=nlei-nldi+1 ; nj=nlej-nldj+1 … … 1648 1648 & latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /))) 1649 1649 1650 IF ( ln_mskland.AND.(.NOT.l xios) ) THEN1650 IF ( ln_mskland.AND.(.NOT.ldxios) ) THEN 1651 1651 ! mask land points, keep values on coast line -> specific mask for U, V and W points 1652 1652 SELECT CASE ( cdgrd ) -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r8612 r8668 202 202 IF(.NOT.lxios_set) lxios_read = lxios_read.AND.lxios_sini 203 203 IF( lxios_read) THEN 204 rxios_context = 'nemo_rst'204 crxios_context = 'nemo_rst' 205 205 if(.NOT.lxios_set) then 206 206 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS' 207 CALL iom_init( rxios_context )207 CALL iom_init( crxios_context ) 208 208 lxios_set = .TRUE. 209 209 endif 210 210 ENDIF 211 211 IF( TRIM(Agrif_CFixed()) /= '0' .AND. lxios_read) THEN 212 CALL iom_init( rxios_context )212 CALL iom_init( crxios_context ) 213 213 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for AGRIF' 214 214 lxios_set = .TRUE. … … 237 237 ! Check dynamics and tracer time-step consistency and force Euler restart if changed 238 238 IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 ) THEN 239 CALL iom_get( numror, 'rdt', zrdt, l rxios = lxios_read )239 CALL iom_get( numror, 'rdt', zrdt, ldxios = lxios_read ) 240 240 IF( zrdt /= rdt ) neuler = 0 241 241 ENDIF 242 242 243 243 ! Diurnal DSST 244 IF( ln_diurnal ) CALL iom_get( numror, jpdom_autoglo, 'Dsst' , x_dsst, l rxios = lxios_read )244 IF( ln_diurnal ) CALL iom_get( numror, jpdom_autoglo, 'Dsst' , x_dsst, ldxios = lxios_read ) 245 245 IF ( ln_diurnal_only ) THEN 246 246 IF(lwp) WRITE( numout, * ) & 247 247 & "rst_read:- ln_diurnal_only set, setting rhop=rau0" 248 248 rhop = rau0 249 CALL iom_get( numror, jpdom_autoglo, 'tn' , tsn(:,:,1,jp_tem), l rxios = lxios_read )249 CALL iom_get( numror, jpdom_autoglo, 'tn' , tsn(:,:,1,jp_tem), ldxios = lxios_read ) 250 250 RETURN 251 251 ENDIF 252 252 253 253 IF( iom_varid( numror, 'ub', ldstop = .FALSE. ) > 0 ) THEN 254 CALL iom_get( numror, jpdom_autoglo, 'ub' , ub, l rxios = lxios_read ) ! before fields255 CALL iom_get( numror, jpdom_autoglo, 'vb' , vb, l rxios = lxios_read )256 CALL iom_get( numror, jpdom_autoglo, 'tb' , tsb(:,:,:,jp_tem), l rxios = lxios_read )257 CALL iom_get( numror, jpdom_autoglo, 'sb' , tsb(:,:,:,jp_sal), l rxios = lxios_read )258 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb, l rxios = lxios_read )254 CALL iom_get( numror, jpdom_autoglo, 'ub' , ub, ldxios = lxios_read ) ! before fields 255 CALL iom_get( numror, jpdom_autoglo, 'vb' , vb, ldxios = lxios_read ) 256 CALL iom_get( numror, jpdom_autoglo, 'tb' , tsb(:,:,:,jp_tem), ldxios = lxios_read ) 257 CALL iom_get( numror, jpdom_autoglo, 'sb' , tsb(:,:,:,jp_sal), ldxios = lxios_read ) 258 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb, ldxios = lxios_read ) 259 259 ELSE 260 260 neuler = 0 261 261 ENDIF 262 262 ! 263 CALL iom_get( numror, jpdom_autoglo, 'un' , un, l rxios = lxios_read ) ! now fields264 CALL iom_get( numror, jpdom_autoglo, 'vn' , vn, l rxios = lxios_read )265 CALL iom_get( numror, jpdom_autoglo, 'tn' , tsn(:,:,:,jp_tem), l rxios = lxios_read )266 CALL iom_get( numror, jpdom_autoglo, 'sn' , tsn(:,:,:,jp_sal), l rxios = lxios_read )267 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn, l rxios = lxios_read )263 CALL iom_get( numror, jpdom_autoglo, 'un' , un, ldxios = lxios_read ) ! now fields 264 CALL iom_get( numror, jpdom_autoglo, 'vn' , vn, ldxios = lxios_read ) 265 CALL iom_get( numror, jpdom_autoglo, 'tn' , tsn(:,:,:,jp_tem), ldxios = lxios_read ) 266 CALL iom_get( numror, jpdom_autoglo, 'sn' , tsn(:,:,:,jp_sal), ldxios = lxios_read ) 267 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn, ldxios = lxios_read ) 268 268 IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN 269 CALL iom_get( numror, jpdom_autoglo, 'rhop' , rhop, l rxios = lxios_read ) ! now potential density269 CALL iom_get( numror, jpdom_autoglo, 'rhop' , rhop, ldxios = lxios_read ) ! now potential density 270 270 ELSE 271 271 CALL eos( tsn, rhd, rhop, gdept_n(:,:,:) ) -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90
r8612 r8668 153 153 IF( ln_rstart .AND. iom_varid( numror, 'ssh_ibb', ldstop = .FALSE. ) > 0 ) THEN 154 154 IF(lwp) WRITE(numout,*) 'sbc_apr: ssh_ibb read in the restart file' 155 CALL iom_get( numror, jpdom_autoglo, 'ssh_ibb', ssh_ibb, l rxios = lxios_read ) ! before inv. barometer ssh155 CALL iom_get( numror, jpdom_autoglo, 'ssh_ibb', ssh_ibb, ldxios = lxios_read ) ! before inv. barometer ssh 156 156 ! 157 157 ELSE !* no restart: set from nit000 values -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90
r8612 r8668 219 219 & iom_varid( numror, 'fwf_isf_b', ldstop = .FALSE. ) > 0 ) THEN 220 220 IF(lwp) WRITE(numout,*) ' nit000-1 isf tracer content forcing fields read in the restart file' 221 CALL iom_get( numror, jpdom_autoglo, 'fwf_isf_b', fwfisf_b(:,:), l rxios = lxios_read ) ! before salt content isf_tsc trend222 CALL iom_get( numror, jpdom_autoglo, 'isf_sc_b', risf_tsc_b(:,:,jp_sal), l rxios = lxios_read ) ! before salt content isf_tsc trend223 CALL iom_get( numror, jpdom_autoglo, 'isf_hc_b', risf_tsc_b(:,:,jp_tem), l rxios = lxios_read ) ! before salt content isf_tsc trend221 CALL iom_get( numror, jpdom_autoglo, 'fwf_isf_b', fwfisf_b(:,:), ldxios = lxios_read ) ! before salt content isf_tsc trend 222 CALL iom_get( numror, jpdom_autoglo, 'isf_sc_b', risf_tsc_b(:,:,jp_sal), ldxios = lxios_read ) ! before salt content isf_tsc trend 223 CALL iom_get( numror, jpdom_autoglo, 'isf_hc_b', risf_tsc_b(:,:,jp_tem), ldxios = lxios_read ) ! before salt content isf_tsc trend 224 224 ELSE 225 225 fwfisf_b(:,:) = fwfisf(:,:) -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
r8612 r8668 458 458 & iom_varid( numror, 'utau_b', ldstop = .FALSE. ) > 0 ) THEN 459 459 IF(lwp) WRITE(numout,*) ' nit000-1 surface forcing fields red in the restart file' 460 CALL iom_get( numror, jpdom_autoglo, 'utau_b', utau_b, l rxios = lxios_read ) ! before i-stress (U-point)461 CALL iom_get( numror, jpdom_autoglo, 'vtau_b', vtau_b, l rxios = lxios_read ) ! before j-stress (V-point)462 CALL iom_get( numror, jpdom_autoglo, 'qns_b' , qns_b, l rxios = lxios_read ) ! before non solar heat flux (T-point)460 CALL iom_get( numror, jpdom_autoglo, 'utau_b', utau_b, ldxios = lxios_read ) ! before i-stress (U-point) 461 CALL iom_get( numror, jpdom_autoglo, 'vtau_b', vtau_b, ldxios = lxios_read ) ! before j-stress (V-point) 462 CALL iom_get( numror, jpdom_autoglo, 'qns_b' , qns_b, ldxios = lxios_read ) ! before non solar heat flux (T-point) 463 463 ! The 3D heat content due to qsr forcing is treated in traqsr 464 ! CALL iom_get( numror, jpdom_autoglo, 'qsr_b' , qsr_b, l rxios = lxios_read ) ! before solar heat flux (T-point)465 CALL iom_get( numror, jpdom_autoglo, 'emp_b', emp_b, l rxios = lxios_read ) ! before freshwater flux (T-point)464 ! CALL iom_get( numror, jpdom_autoglo, 'qsr_b' , qsr_b, ldxios = lxios_read ) ! before solar heat flux (T-point) 465 CALL iom_get( numror, jpdom_autoglo, 'emp_b', emp_b, ldxios = lxios_read ) ! before freshwater flux (T-point) 466 466 ! To ensure restart capability with 3.3x/3.4 restart files !! to be removed in v3.6 467 467 IF( iom_varid( numror, 'sfx_b', ldstop = .FALSE. ) > 0 ) THEN 468 CALL iom_get( numror, jpdom_autoglo, 'sfx_b', sfx_b, l rxios = lxios_read ) ! before salt flux (T-point)468 CALL iom_get( numror, jpdom_autoglo, 'sfx_b', sfx_b, ldxios = lxios_read ) ! before salt flux (T-point) 469 469 ELSE 470 470 sfx_b (:,:) = sfx(:,:) -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
r8612 r8668 149 149 & iom_varid( numror, 'rnf_b', ldstop = .FALSE. ) > 0 ) THEN 150 150 IF(lwp) WRITE(numout,*) ' nit000-1 runoff forcing fields red in the restart file', lxios_read 151 CALL iom_get( numror, jpdom_autoglo, 'rnf_b', rnf_b, l rxios = lxios_read ) ! before runoff152 CALL iom_get( numror, jpdom_autoglo, 'rnf_hc_b', rnf_tsc_b(:,:,jp_tem), l rxios = lxios_read ) ! before heat content of runoff153 CALL iom_get( numror, jpdom_autoglo, 'rnf_sc_b', rnf_tsc_b(:,:,jp_sal), l rxios = lxios_read ) ! before salinity content of runoff151 CALL iom_get( numror, jpdom_autoglo, 'rnf_b', rnf_b, ldxios = lxios_read ) ! before runoff 152 CALL iom_get( numror, jpdom_autoglo, 'rnf_hc_b', rnf_tsc_b(:,:,jp_tem), ldxios = lxios_read ) ! before heat content of runoff 153 CALL iom_get( numror, jpdom_autoglo, 'rnf_sc_b', rnf_tsc_b(:,:,jp_sal), ldxios = lxios_read ) ! before salinity content of runoff 154 154 ELSE !* no restart: set from nit000 values 155 155 IF(lwp) WRITE(numout,*) ' nit000-1 runoff forcing fields set to nit000' -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
r8612 r8668 207 207 IF( ln_rstart .AND. iom_varid( numror, 'nn_fsbc', ldstop = .FALSE. ) > 0 ) THEN 208 208 l_ssm_mean = .TRUE. 209 CALL iom_get( numror , 'nn_fsbc', zf_sbc, l rxios = lxios_read ) ! sbc frequency of previous run210 CALL iom_get( numror, jpdom_autoglo, 'ssu_m' , ssu_m, l rxios = lxios_read ) ! sea surface mean velocity (U-point)211 CALL iom_get( numror, jpdom_autoglo, 'ssv_m' , ssv_m, l rxios = lxios_read ) ! " " velocity (V-point)212 CALL iom_get( numror, jpdom_autoglo, 'sst_m' , sst_m, l rxios = lxios_read ) ! " " temperature (T-point)213 CALL iom_get( numror, jpdom_autoglo, 'sss_m' , sss_m, l rxios = lxios_read ) ! " " salinity (T-point)214 CALL iom_get( numror, jpdom_autoglo, 'ssh_m' , ssh_m, l rxios = lxios_read ) ! " " height (T-point)215 CALL iom_get( numror, jpdom_autoglo, 'e3t_m' , e3t_m, l rxios = lxios_read ) ! 1st level thickness (T-point)216 CALL iom_get( numror, jpdom_autoglo, 'e3t_m', e3t_m, l rxios = lxios_read )209 CALL iom_get( numror , 'nn_fsbc', zf_sbc, ldxios = lxios_read ) ! sbc frequency of previous run 210 CALL iom_get( numror, jpdom_autoglo, 'ssu_m' , ssu_m, ldxios = lxios_read ) ! sea surface mean velocity (U-point) 211 CALL iom_get( numror, jpdom_autoglo, 'ssv_m' , ssv_m, ldxios = lxios_read ) ! " " velocity (V-point) 212 CALL iom_get( numror, jpdom_autoglo, 'sst_m' , sst_m, ldxios = lxios_read ) ! " " temperature (T-point) 213 CALL iom_get( numror, jpdom_autoglo, 'sss_m' , sss_m, ldxios = lxios_read ) ! " " salinity (T-point) 214 CALL iom_get( numror, jpdom_autoglo, 'ssh_m' , ssh_m, ldxios = lxios_read ) ! " " height (T-point) 215 CALL iom_get( numror, jpdom_autoglo, 'e3t_m' , e3t_m, ldxios = lxios_read ) ! 1st level thickness (T-point) 216 CALL iom_get( numror, jpdom_autoglo, 'e3t_m', e3t_m, ldxios = lxios_read ) 217 217 ! fraction of solar net radiation absorbed in 1st T level 218 218 IF( iom_varid( numror, 'frq_m', ldstop = .FALSE. ) > 0 ) THEN 219 CALL iom_get( numror, jpdom_autoglo, 'frq_m' , frq_m, l rxios = lxios_read )219 CALL iom_get( numror, jpdom_autoglo, 'frq_m' , frq_m, ldxios = lxios_read ) 220 220 ELSE 221 221 frq_m(:,:) = 1._wp ! default definition -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
r8612 r8668 139 139 IF(lwp) WRITE(numout,*) ' nit000-1 qsr tracer content forcing field read in the restart file' 140 140 z1_2 = 0.5_wp 141 CALL iom_get( numror, jpdom_autoglo, 'qsr_hc_b', qsr_hc_b, l rxios = lxios_read ) ! before heat content trend due to Qsr flux141 CALL iom_get( numror, jpdom_autoglo, 'qsr_hc_b', qsr_hc_b, ldxios = lxios_read ) ! before heat content trend due to Qsr flux 142 142 ELSE ! No restart or restart not found: Euler forward time stepping 143 143 z1_2 = 1._wp … … 430 430 ! 1st ocean level attenuation coefficient (used in sbcssm) 431 431 IF( iom_varid( numror, 'fraqsr_1lev', ldstop = .FALSE. ) > 0 ) THEN 432 CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev' , fraqsr_1lev, l rxios = lxios_read )432 CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev' , fraqsr_1lev, ldxios = lxios_read ) 433 433 ELSE 434 434 fraqsr_1lev(:,:) = 1._wp ! default : no penetration -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r8612 r8668 109 109 zfact = 0.5_wp 110 110 sbc_tsc(:,:,:) = 0._wp 111 CALL iom_get( numror, jpdom_autoglo, 'sbc_hc_b', sbc_tsc_b(:,:,jp_tem), l rxios = lxios_read ) ! before heat content sbc trend112 CALL iom_get( numror, jpdom_autoglo, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal), l rxios = lxios_read ) ! before salt content sbc trend111 CALL iom_get( numror, jpdom_autoglo, 'sbc_hc_b', sbc_tsc_b(:,:,jp_tem), ldxios = lxios_read ) ! before heat content sbc trend 112 CALL iom_get( numror, jpdom_autoglo, 'sbc_sc_b', sbc_tsc_b(:,:,jp_sal), ldxios = lxios_read ) ! before salt content sbc trend 113 113 ELSE ! No restart or restart not found: Euler forward time stepping 114 114 zfact = 1._wp -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
r8612 r8668 1176 1176 ! 1177 1177 IF( MIN( id1, id2, id3, id4, id5, id6 ) > 0 ) THEN ! all required arrays exist 1178 CALL iom_get( numror, jpdom_autoglo, 'en' , en, l rxios = lxios_read )1179 CALL iom_get( numror, jpdom_autoglo, 'avt' , avt, l rxios = lxios_read )1180 CALL iom_get( numror, jpdom_autoglo, 'avm' , avm, l rxios = lxios_read )1181 CALL iom_get( numror, jpdom_autoglo, 'avmu' , avmu, l rxios = lxios_read )1182 CALL iom_get( numror, jpdom_autoglo, 'avmv' , avmv, l rxios = lxios_read )1183 CALL iom_get( numror, jpdom_autoglo, 'mxln' , mxln, l rxios = lxios_read )1178 CALL iom_get( numror, jpdom_autoglo, 'en' , en, ldxios = lxios_read ) 1179 CALL iom_get( numror, jpdom_autoglo, 'avt' , avt, ldxios = lxios_read ) 1180 CALL iom_get( numror, jpdom_autoglo, 'avm' , avm, ldxios = lxios_read ) 1181 CALL iom_get( numror, jpdom_autoglo, 'avmu' , avmu, ldxios = lxios_read ) 1182 CALL iom_get( numror, jpdom_autoglo, 'avmv' , avmv, ldxios = lxios_read ) 1183 CALL iom_get( numror, jpdom_autoglo, 'mxln' , mxln, ldxios = lxios_read ) 1184 1184 ELSE 1185 1185 IF(lwp) WRITE(numout,*) ' ===>>>> : previous run without gls scheme, en and mxln computed by iterative loop' -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90
r8612 r8668 160 160 ! file in traadv_cen2 end read here. 161 161 IF( iom_varid( numror, 'avmb', ldstop = .FALSE. ) > 0 ) THEN 162 CALL iom_get( numror, jpdom_unknown, 'avmb', avmb, l rxios = lxios_read )163 CALL iom_get( numror, jpdom_unknown, 'avtb', avtb, l rxios = lxios_read )162 CALL iom_get( numror, jpdom_unknown, 'avmb', avmb, ldxios = lxios_read ) 163 CALL iom_get( numror, jpdom_unknown, 'avtb', avtb, ldxios = lxios_read ) 164 164 ENDIF 165 165 ENDIF -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
r8612 r8668 846 846 ! 847 847 IF( id1 > 0 ) THEN ! 'en' exists 848 CALL iom_get( numror, jpdom_autoglo, 'en', en, l rxios = lxios_read )848 CALL iom_get( numror, jpdom_autoglo, 'en', en, ldxios = lxios_read ) 849 849 IF( MIN( id2, id3, id4, id5, id6 ) > 0 ) THEN ! all required arrays exist 850 CALL iom_get( numror, jpdom_autoglo, 'avt' , avt, l rxios = lxios_read )851 CALL iom_get( numror, jpdom_autoglo, 'avm' , avm, l rxios = lxios_read )852 CALL iom_get( numror, jpdom_autoglo, 'avmu' , avmu, l rxios = lxios_read )853 CALL iom_get( numror, jpdom_autoglo, 'avmv' , avmv, l rxios = lxios_read )854 CALL iom_get( numror, jpdom_autoglo, 'dissl', dissl, l rxios = lxios_read )850 CALL iom_get( numror, jpdom_autoglo, 'avt' , avt, ldxios = lxios_read ) 851 CALL iom_get( numror, jpdom_autoglo, 'avm' , avm, ldxios = lxios_read ) 852 CALL iom_get( numror, jpdom_autoglo, 'avmu' , avmu, ldxios = lxios_read ) 853 CALL iom_get( numror, jpdom_autoglo, 'avmv' , avmv, ldxios = lxios_read ) 854 CALL iom_get( numror, jpdom_autoglo, 'dissl', dissl, ldxios = lxios_read ) 855 855 ELSE ! one at least array is missing 856 856 CALL tke_avn ! compute avt, avm, avmu, avmv and dissl (approximation) -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/OPA_SRC/step.F90
r8612 r8668 345 345 IF( kstp == nitend .OR. indic < 0 ) THEN 346 346 CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF 347 IF(lxios_read) CALL iom_context_finalize( rxios_context )347 IF(lxios_read) CALL iom_context_finalize( crxios_context ) 348 348 IF( ln_crs ) CALL iom_context_finalize( trim(cxios_context)//"_crs" ) ! 349 349 ENDIF -
branches/2017/dev_r8600_xios_read/NEMOGCM/NEMO/SAS_SRC/daymod.F90
r8612 r8668 318 318 IF( iom_varid( numror, 'kt', ldstop = .FALSE. ) > 0 ) THEN 319 319 ! Get Calendar informations 320 CALL iom_get( numror, 'kt', zk, l rxios = lxios_read ) ! last time-step of previous run320 CALL iom_get( numror, 'kt', zk, ldxios = lxios_read ) ! last time-step of previous run 321 321 IF(lwp) THEN 322 322 WRITE(numout,*) ' *** Info read in restart : ' … … 337 337 IF ( nrstdt == 2 ) THEN 338 338 ! read the parameters corresponding to nit000 - 1 (last time step of previous run) 339 CALL iom_get( numror, 'ndastp', zndastp, l rxios = lxios_read )339 CALL iom_get( numror, 'ndastp', zndastp, ldxios = lxios_read ) 340 340 ndastp = NINT( zndastp ) 341 CALL iom_get( numror, 'adatrj', adatrj, l rxios = lxios_read )342 CALL iom_get( numror, 'ntime', ktime, l rxios = lxios_read )341 CALL iom_get( numror, 'adatrj', adatrj, ldxios = lxios_read ) 342 CALL iom_get( numror, 'ntime', ktime, ldxios = lxios_read ) 343 343 nn_time0=INT(ktime) 344 344 ! calculate start time in hours and minutes
Note: See TracChangeset
for help on using the changeset viewer.
