Changeset 13871 for NEMO/branches/2020/dev_12905_xios_restart/tests
- Timestamp:
- 2020-11-25T12:51:29+01:00 (3 years ago)
- Location:
- NEMO/branches/2020/dev_12905_xios_restart/tests
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_12905_xios_restart/tests/CANAL/MY_SRC/domvvl.F90
r13727 r13871 785 785 IF( ln_rstart ) THEN !* Read the restart file 786 786 CALL rst_read_open ! open the restart file if necessary 787 IF( lr oxios ) CALL iom_swap( TRIM(crxios_context))788 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm), ldxios = lr oxios )787 IF( lrxios ) CALL iom_swap( cr_ocerst_cxt ) 788 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm), ldxios = lrxios ) 789 789 ! 790 790 id1 = iom_varid( numror, 'e3t_b', ldstop = .FALSE. ) … … 799 799 ! 800 800 IF( MIN( id1, id2 ) > 0 ) THEN ! all required arrays exist 801 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lr oxios )802 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lr oxios )801 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lrxios ) 802 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lrxios ) 803 803 ! needed to restart if land processor not computed 804 804 IF(lwp) write(numout,*) 'dom_vvl_rst : e3t(:,:,:,Kbb) and e3t(:,:,:,Kmm) found in restart files' … … 814 814 IF(lwp) write(numout,*) 'e3t_n set equal to e3t_b.' 815 815 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 816 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lr oxios )816 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lrxios ) 817 817 e3t(:,:,:,Kmm) = e3t(:,:,:,Kbb) 818 818 l_1st_euler = .true. … … 821 821 IF(lwp) write(numout,*) 'e3t_b set equal to e3t_n.' 822 822 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 823 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lr oxios )823 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lrxios ) 824 824 e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm) 825 825 l_1st_euler = .true. … … 846 846 ! ! ----------------------- ! 847 847 IF( MIN( id3, id4 ) > 0 ) THEN ! all required arrays exist 848 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:), ldxios = lr oxios )849 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:), ldxios = lr oxios )848 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:), ldxios = lrxios ) 849 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:), ldxios = lrxios ) 850 850 ELSE ! one at least array is missing 851 851 tilde_e3t_b(:,:,:) = 0.0_wp … … 856 856 ! ! ------------ ! 857 857 IF( id5 > 0 ) THEN ! required array exists 858 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:), ldxios = lr oxios )858 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:), ldxios = lrxios ) 859 859 ELSE ! array is missing 860 860 hdiv_lf(:,:,:) = 0.0_wp … … 862 862 ENDIF 863 863 ENDIF 864 IF( lr oxios ) CALL iom_swap( TRIM(cxios_context))864 IF( lrxios ) CALL iom_swap( cxios_context ) 865 865 ! 866 866 ELSE !* Initialize at "rest" … … 931 931 ! ! =================== 932 932 IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----' 933 IF( lwxios ) CALL iom_swap( cw xios_context )933 IF( lwxios ) CALL iom_swap( cw_ocerst_cxt ) 934 934 ! ! --------- ! 935 935 ! ! all cases ! -
NEMO/branches/2020/dev_12905_xios_restart/tests/VORTEX/MY_SRC/domvvl.F90
r13750 r13871 785 785 IF( ln_rstart ) THEN !* Read the restart file 786 786 CALL rst_read_open ! open the restart file if necessary 787 IF( lr oxios ) CALL iom_swap( TRIM(crxios_context))788 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm), ldxios = lr oxios )787 IF( lrxios ) CALL iom_swap( cr_ocerst_cxt ) 788 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm), ldxios = lrxios ) 789 789 ! 790 790 id1 = iom_varid( numror, 'e3t_b', ldstop = .FALSE. ) … … 799 799 ! 800 800 IF( MIN( id1, id2 ) > 0 ) THEN ! all required arrays exist 801 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lr oxios )802 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lr oxios )801 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lrxios ) 802 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lrxios ) 803 803 ! needed to restart if land processor not computed 804 804 IF(lwp) write(numout,*) 'dom_vvl_rst : e3t(:,:,:,Kbb) and e3t(:,:,:,Kmm) found in restart files' … … 814 814 IF(lwp) write(numout,*) 'e3t_n set equal to e3t_b.' 815 815 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 816 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lr oxios )816 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb), ldxios = lrxios ) 817 817 e3t(:,:,:,Kmm) = e3t(:,:,:,Kbb) 818 818 l_1st_euler = .true. … … 821 821 IF(lwp) write(numout,*) 'e3t_b set equal to e3t_n.' 822 822 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 823 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lr oxios )823 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm), ldxios = lrxios ) 824 824 e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm) 825 825 l_1st_euler = .true. … … 846 846 ! ! ----------------------- ! 847 847 IF( MIN( id3, id4 ) > 0 ) THEN ! all required arrays exist 848 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:), ldxios = lr oxios )849 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:), ldxios = lr oxios )848 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:), ldxios = lrxios ) 849 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:), ldxios = lrxios ) 850 850 ELSE ! one at least array is missing 851 851 tilde_e3t_b(:,:,:) = 0.0_wp … … 856 856 ! ! ------------ ! 857 857 IF( id5 > 0 ) THEN ! required array exists 858 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:), ldxios = lr oxios )858 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:), ldxios = lrxios ) 859 859 ELSE ! array is missing 860 860 hdiv_lf(:,:,:) = 0.0_wp … … 862 862 ENDIF 863 863 ENDIF 864 IF( lr oxios ) CALL iom_swap( TRIM(cxios_context))864 IF( lrxios ) CALL iom_swap( cxios_context ) 865 865 ! 866 866 ELSE !* Initialize at "rest" … … 931 931 ! ! =================== 932 932 IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----' 933 IF( lwxios ) CALL iom_swap( cw xios_context )933 IF( lwxios ) CALL iom_swap( cw_ocerst_cxt ) 934 934 ! ! --------- ! 935 935 ! ! all cases !
Note: See TracChangeset
for help on using the changeset viewer.