Changeset 13932 for NEMO/branches/2020/dev_12905_xios_restart/tests
- Timestamp:
- 2020-12-01T09:21:09+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
r13871 r13932 785 785 IF( ln_rstart ) THEN !* Read the restart file 786 786 CALL rst_read_open ! open the restart file if necessary 787 IF( lrxios ) CALL iom_swap( cr_ocerst_cxt ) 788 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm), ldxios = lrxios ) 787 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm) ) 789 788 ! 790 789 id1 = iom_varid( numror, 'e3t_b', ldstop = .FALSE. ) … … 799 798 ! 800 799 IF( MIN( id1, id2 ) > 0 ) THEN ! all required arrays exist 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)800 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) ) 801 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) ) 803 802 ! needed to restart if land processor not computed 804 803 IF(lwp) write(numout,*) 'dom_vvl_rst : e3t(:,:,:,Kbb) and e3t(:,:,:,Kmm) found in restart files' … … 814 813 IF(lwp) write(numout,*) 'e3t_n set equal to e3t_b.' 815 814 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 816 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) , ldxios = lrxios)815 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) ) 817 816 e3t(:,:,:,Kmm) = e3t(:,:,:,Kbb) 818 817 l_1st_euler = .true. … … 821 820 IF(lwp) write(numout,*) 'e3t_b set equal to e3t_n.' 822 821 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 823 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) , ldxios = lrxios)822 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) ) 824 823 e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm) 825 824 l_1st_euler = .true. … … 846 845 ! ! ----------------------- ! 847 846 IF( MIN( id3, id4 ) > 0 ) THEN ! all required arrays exist 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)847 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:) ) 848 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:) ) 850 849 ELSE ! one at least array is missing 851 850 tilde_e3t_b(:,:,:) = 0.0_wp … … 856 855 ! ! ------------ ! 857 856 IF( id5 > 0 ) THEN ! required array exists 858 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lrxios)857 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:) ) 859 858 ELSE ! array is missing 860 859 hdiv_lf(:,:,:) = 0.0_wp … … 862 861 ENDIF 863 862 ENDIF 864 IF( lrxios ) CALL iom_swap( cxios_context )865 863 ! 866 864 ELSE !* Initialize at "rest" … … 931 929 ! ! =================== 932 930 IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----' 933 IF( lwxios ) CALL iom_swap( cw_ocerst_cxt )934 931 ! ! --------- ! 935 932 ! ! all cases ! 936 933 ! ! --------- ! 937 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t(:,:,:,Kbb) , ldxios = lwxios)938 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t(:,:,:,Kmm) , ldxios = lwxios)934 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t(:,:,:,Kbb) ) 935 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t(:,:,:,Kmm) ) 939 936 ! ! ----------------------- ! 940 937 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases ! 941 938 ! ! ----------------------- ! 942 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:) , ldxios = lwxios)943 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:) , ldxios = lwxios)939 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:)) 940 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:)) 944 941 END IF 945 942 ! ! -------------! 946 943 IF( ln_vvl_ztilde ) THEN ! z_tilde case ! 947 944 ! ! ------------ ! 948 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lwxios)945 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:)) 949 946 ENDIF 950 947 ! 951 IF( lwxios ) CALL iom_swap( cxios_context )952 948 ENDIF 953 949 ! -
NEMO/branches/2020/dev_12905_xios_restart/tests/VORTEX/MY_SRC/domvvl.F90
r13871 r13932 785 785 IF( ln_rstart ) THEN !* Read the restart file 786 786 CALL rst_read_open ! open the restart file if necessary 787 IF( lrxios ) CALL iom_swap( cr_ocerst_cxt ) 788 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm), ldxios = lrxios ) 787 CALL iom_get( numror, jpdom_auto, 'sshn' , ssh(:,:,Kmm) ) 789 788 ! 790 789 id1 = iom_varid( numror, 'e3t_b', ldstop = .FALSE. ) … … 799 798 ! 800 799 IF( MIN( id1, id2 ) > 0 ) THEN ! all required arrays exist 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)800 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) ) 801 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) ) 803 802 ! needed to restart if land processor not computed 804 803 IF(lwp) write(numout,*) 'dom_vvl_rst : e3t(:,:,:,Kbb) and e3t(:,:,:,Kmm) found in restart files' … … 814 813 IF(lwp) write(numout,*) 'e3t_n set equal to e3t_b.' 815 814 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 816 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) , ldxios = lrxios)815 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) ) 817 816 e3t(:,:,:,Kmm) = e3t(:,:,:,Kbb) 818 817 l_1st_euler = .true. … … 821 820 IF(lwp) write(numout,*) 'e3t_b set equal to e3t_n.' 822 821 IF(lwp) write(numout,*) 'l_1st_euler is forced to true' 823 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) , ldxios = lrxios)822 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) ) 824 823 e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm) 825 824 l_1st_euler = .true. … … 846 845 ! ! ----------------------- ! 847 846 IF( MIN( id3, id4 ) > 0 ) THEN ! all required arrays exist 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)847 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:) ) 848 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:) ) 850 849 ELSE ! one at least array is missing 851 850 tilde_e3t_b(:,:,:) = 0.0_wp … … 856 855 ! ! ------------ ! 857 856 IF( id5 > 0 ) THEN ! required array exists 858 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lrxios)857 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:) ) 859 858 ELSE ! array is missing 860 859 hdiv_lf(:,:,:) = 0.0_wp … … 862 861 ENDIF 863 862 ENDIF 864 IF( lrxios ) CALL iom_swap( cxios_context )865 863 ! 866 864 ELSE !* Initialize at "rest" … … 931 929 ! ! =================== 932 930 IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----' 933 IF( lwxios ) CALL iom_swap( cw_ocerst_cxt )934 931 ! ! --------- ! 935 932 ! ! all cases ! 936 933 ! ! --------- ! 937 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t(:,:,:,Kbb) , ldxios = lwxios)938 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t(:,:,:,Kmm) , ldxios = lwxios)934 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t(:,:,:,Kbb) ) 935 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t(:,:,:,Kmm) ) 939 936 ! ! ----------------------- ! 940 937 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases ! 941 938 ! ! ----------------------- ! 942 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:) , ldxios = lwxios)943 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:) , ldxios = lwxios)939 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:)) 940 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:)) 944 941 END IF 945 942 ! ! -------------! 946 943 IF( ln_vvl_ztilde ) THEN ! z_tilde case ! 947 944 ! ! ------------ ! 948 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lwxios)945 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:)) 949 946 ENDIF 950 947 ! 951 IF( lwxios ) CALL iom_swap( cxios_context )952 948 ENDIF 953 949 !
Note: See TracChangeset
for help on using the changeset viewer.