- Timestamp:
- 2017-11-23T16:52:17+01:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8600_xios_read_write_v2/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
r8800 r8801 32 32 USE timing ! preformance summary 33 33 USE wrk_nemo ! work arrays 34 USE iom_def, ONLY : lxios_read 34 USE iom_def, ONLY : lwxios 35 USE iom_def, ONLY : lrxios 35 36 36 37 IMPLICIT NONE … … 256 257 IF(lwp) WRITE(numout,*) ' dia_hsb_rst at it= ', kt,' date= ', ndastp 257 258 IF(lwp) WRITE(numout,*) '~~~~~~~' 258 CALL iom_get( numror, 'frc_v', frc_v, ldxios = l xios_read)259 CALL iom_get( numror, 'frc_t', frc_t, ldxios = l xios_read)260 CALL iom_get( numror, 'frc_s', frc_s, ldxios = l xios_read)259 CALL iom_get( numror, 'frc_v', frc_v, ldxios = lrxios ) 260 CALL iom_get( numror, 'frc_t', frc_t, ldxios = lrxios ) 261 CALL iom_get( numror, 'frc_s', frc_s, ldxios = lrxios ) 261 262 IF( ln_linssh ) THEN 262 CALL iom_get( numror, 'frc_wn_t', frc_wn_t, ldxios = l xios_read)263 CALL iom_get( numror, 'frc_wn_s', frc_wn_s, ldxios = l xios_read)263 CALL iom_get( numror, 'frc_wn_t', frc_wn_t, ldxios = lrxios ) 264 CALL iom_get( numror, 'frc_wn_s', frc_wn_s, ldxios = lrxios ) 264 265 ENDIF 265 CALL iom_get( numror, jpdom_autoglo, 'surf_ini', surf_ini, ldxios = l xios_read) ! ice sheet coupling266 CALL iom_get( numror, jpdom_autoglo, 'ssh_ini', ssh_ini(:,:), ldxios = l xios_read)267 CALL iom_get( numror, jpdom_autoglo, 'e3t_ini', e3t_ini(:,:,:), ldxios = l xios_read)268 CALL iom_get( numror, jpdom_autoglo, 'hc_loc_ini', hc_loc_ini(:,:,:), ldxios = l xios_read)269 CALL iom_get( numror, jpdom_autoglo, 'sc_loc_ini', sc_loc_ini(:,:,:), ldxios = l xios_read)266 CALL iom_get( numror, jpdom_autoglo, 'surf_ini', surf_ini, ldxios = lrxios ) ! ice sheet coupling 267 CALL iom_get( numror, jpdom_autoglo, 'ssh_ini', ssh_ini(:,:), ldxios = lrxios ) 268 CALL iom_get( numror, jpdom_autoglo, 'e3t_ini', e3t_ini(:,:,:), ldxios = lrxios ) 269 CALL iom_get( numror, jpdom_autoglo, 'hc_loc_ini', hc_loc_ini(:,:,:), ldxios = lrxios ) 270 CALL iom_get( numror, jpdom_autoglo, 'sc_loc_ini', sc_loc_ini(:,:,:), ldxios = lrxios ) 270 271 IF( ln_linssh ) THEN 271 CALL iom_get( numror, jpdom_autoglo, 'ssh_hc_loc_ini', ssh_hc_loc_ini(:,:), ldxios = l xios_read)272 CALL iom_get( numror, jpdom_autoglo, 'ssh_sc_loc_ini', ssh_sc_loc_ini(:,:), ldxios = l xios_read)272 CALL iom_get( numror, jpdom_autoglo, 'ssh_hc_loc_ini', ssh_hc_loc_ini(:,:), ldxios = lrxios ) 273 CALL iom_get( numror, jpdom_autoglo, 'ssh_sc_loc_ini', ssh_sc_loc_ini(:,:), ldxios = lrxios ) 273 274 ENDIF 274 275 ELSE … … 309 310 IF(lwp) WRITE(numout,*) ' dia_hsb_rst at it= ', kt,' date= ', ndastp 310 311 IF(lwp) WRITE(numout,*) '~~~~~~~' 311 312 CALL iom_rstput( kt, nitrst, numrow, 'frc_v' , frc_v 313 CALL iom_rstput( kt, nitrst, numrow, 'frc_t' , frc_t 314 CALL iom_rstput( kt, nitrst, numrow, 'frc_s' , frc_s 312 IF( lwxios ) CALL iom_swap( cwxios_context ) 313 CALL iom_rstput( kt, nitrst, numrow, 'frc_v' , frc_v, ldxios = lwxios) 314 CALL iom_rstput( kt, nitrst, numrow, 'frc_t' , frc_t, ldxios = lwxios) 315 CALL iom_rstput( kt, nitrst, numrow, 'frc_s' , frc_s, ldxios = lwxios) 315 316 IF( ln_linssh ) THEN 316 CALL iom_rstput( kt, nitrst, numrow, 'frc_wn_t', frc_wn_t 317 CALL iom_rstput( kt, nitrst, numrow, 'frc_wn_s', frc_wn_s )317 CALL iom_rstput( kt, nitrst, numrow, 'frc_wn_t', frc_wn_t, ldxios = lwxios) 318 CALL iom_rstput( kt, nitrst, numrow, 'frc_wn_s', frc_wn_s, ldxios = lwxios ) 318 319 ENDIF 319 CALL iom_rstput( kt, nitrst, numrow, 'surf_ini', surf_ini ) ! ice sheet coupling320 CALL iom_rstput( kt, nitrst, numrow, 'ssh_ini', ssh_ini(:,:) )321 CALL iom_rstput( kt, nitrst, numrow, 'e3t_ini', e3t_ini(:,:,:) )322 CALL iom_rstput( kt, nitrst, numrow, 'hc_loc_ini', hc_loc_ini(:,:,:) )323 CALL iom_rstput( kt, nitrst, numrow, 'sc_loc_ini', sc_loc_ini(:,:,:) )320 CALL iom_rstput( kt, nitrst, numrow, 'surf_ini', surf_ini, ldxios = lwxios ) ! ice sheet coupling 321 CALL iom_rstput( kt, nitrst, numrow, 'ssh_ini', ssh_ini(:,:), ldxios = lwxios ) 322 CALL iom_rstput( kt, nitrst, numrow, 'e3t_ini', e3t_ini(:,:,:), ldxios = lwxios ) 323 CALL iom_rstput( kt, nitrst, numrow, 'hc_loc_ini', hc_loc_ini(:,:,:), ldxios = lwxios ) 324 CALL iom_rstput( kt, nitrst, numrow, 'sc_loc_ini', sc_loc_ini(:,:,:), ldxios = lwxios ) 324 325 IF( ln_linssh ) THEN 325 CALL iom_rstput( kt, nitrst, numrow, 'ssh_hc_loc_ini', ssh_hc_loc_ini(:,:) )326 CALL iom_rstput( kt, nitrst, numrow, 'ssh_sc_loc_ini', ssh_sc_loc_ini(:,:) )326 CALL iom_rstput( kt, nitrst, numrow, 'ssh_hc_loc_ini', ssh_hc_loc_ini(:,:), ldxios = lwxios ) 327 CALL iom_rstput( kt, nitrst, numrow, 'ssh_sc_loc_ini', ssh_sc_loc_ini(:,:), ldxios = lwxios ) 327 328 ENDIF 328 329 ! 330 IF( lwxios ) CALL iom_swap( cxios_context ) 329 331 ENDIF 330 332 ! … … 368 370 IF( .NOT. ln_diahsb ) RETURN 369 371 372 IF(lwxios) THEN 373 ! define variables in restart file when writing with XIOS 374 CALL iom_set_rstw_var_active('frc_v') 375 CALL iom_set_rstw_var_active('frc_t') 376 CALL iom_set_rstw_var_active('frc_s') 377 IF( ln_linssh ) THEN 378 CALL iom_set_rstw_var_active('frc_wn_t') 379 CALL iom_set_rstw_var_active('frc_wn_s') 380 ENDIF 381 CALL iom_set_rstw_var_active('surf_ini') 382 CALL iom_set_rstw_var_active('ssh_ini') 383 CALL iom_set_rstw_var_active('e3t_ini') 384 CALL iom_set_rstw_var_active('hc_loc_ini') 385 CALL iom_set_rstw_var_active('sc_loc_ini') 386 IF( ln_linssh ) THEN 387 CALL iom_set_rstw_var_active('ssh_hc_loc_ini') 388 CALL iom_set_rstw_var_active('ssh_sc_loc_ini') 389 ENDIF 390 ENDIF 370 391 ! ------------------- ! 371 392 ! 1 - Allocate memory !
Note: See TracChangeset
for help on using the changeset viewer.
