- Timestamp:
- 2017-12-06T16:16:55+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_METO_2017/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r8910 r8924 242 242 ENDIF 243 243 ! 244 IF(lwxios) THEN245 ! define variables in restart file when writing with XIOS246 CALL iom_set_rstw_var_active('e3t_b')247 CALL iom_set_rstw_var_active('e3t_n')248 ! ! ----------------------- !249 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases !250 ! ! ----------------------- !251 CALL iom_set_rstw_var_active('tilde_e3t_b')252 CALL iom_set_rstw_var_active('tilde_e3t_n')253 END IF254 ! ! -------------!255 IF( ln_vvl_ztilde ) THEN ! z_tilde case !256 ! ! ------------ !257 CALL iom_set_rstw_var_active('hdiv_lf')258 ENDIF259 !260 ENDIF261 262 244 IF( nn_timing == 1 ) CALL timing_stop('dom_vvl_init') 263 245 ! … … 817 799 IF( ln_rstart ) THEN !* Read the restart file 818 800 CALL rst_read_open ! open the restart file if necessary 819 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn , ldxios = lrxios)801 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn ) 820 802 ! 821 803 id1 = iom_varid( numror, 'e3t_b', ldstop = .FALSE. ) … … 828 810 ! ! --------- ! 829 811 IF( MIN( id1, id2 ) > 0 ) THEN ! all required arrays exist 830 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:) , ldxios = lrxios)831 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:) , ldxios = lrxios)812 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:) ) 813 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:) ) 832 814 ! needed to restart if land processor not computed 833 815 IF(lwp) write(numout,*) 'dom_vvl_rst : e3t_b and e3t_n found in restart files' … … 843 825 IF(lwp) write(numout,*) 'e3t_n set equal to e3t_b.' 844 826 IF(lwp) write(numout,*) 'neuler is forced to 0' 845 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:) , ldxios = lrxios)827 CALL iom_get( numror, jpdom_autoglo, 'e3t_b', e3t_b(:,:,:) ) 846 828 e3t_n(:,:,:) = e3t_b(:,:,:) 847 829 neuler = 0 … … 850 832 IF(lwp) write(numout,*) 'e3t_b set equal to e3t_n.' 851 833 IF(lwp) write(numout,*) 'neuler is forced to 0' 852 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:) , ldxios = lrxios)834 CALL iom_get( numror, jpdom_autoglo, 'e3t_n', e3t_n(:,:,:) ) 853 835 e3t_b(:,:,:) = e3t_n(:,:,:) 854 836 neuler = 0 … … 875 857 ! ! ----------------------- ! 876 858 IF( MIN( id3, id4 ) > 0 ) THEN ! all required arrays exist 877 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_b', tilde_e3t_b(:,:,:) , ldxios = lrxios)878 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_n', tilde_e3t_n(:,:,:) , ldxios = lrxios)859 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_b', tilde_e3t_b(:,:,:) ) 860 CALL iom_get( numror, jpdom_autoglo, 'tilde_e3t_n', tilde_e3t_n(:,:,:) ) 879 861 ELSE ! one at least array is missing 880 862 tilde_e3t_b(:,:,:) = 0.0_wp … … 885 867 ! ! ------------ ! 886 868 IF( id5 > 0 ) THEN ! required array exists 887 CALL iom_get( numror, jpdom_autoglo, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lrxios)869 CALL iom_get( numror, jpdom_autoglo, 'hdiv_lf', hdiv_lf(:,:,:) ) 888 870 ELSE ! array is missing 889 871 hdiv_lf(:,:,:) = 0.0_wp … … 946 928 ! ! =================== 947 929 IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----' 948 IF( lwxios ) CALL iom_swap( cwxios_context )949 930 ! ! --------- ! 950 931 ! ! all cases ! 951 932 ! ! --------- ! 952 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t_b(:,:,:) , ldxios = lwxios)953 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t_n(:,:,:) , ldxios = lwxios)933 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t_b(:,:,:) ) 934 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t_n(:,:,:) ) 954 935 ! ! ----------------------- ! 955 936 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases ! 956 937 ! ! ----------------------- ! 957 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:) , ldxios = lwxios)958 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:) , ldxios = lwxios)938 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:) ) 939 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:) ) 959 940 END IF 960 941 ! ! -------------! 961 942 IF( ln_vvl_ztilde ) THEN ! z_tilde case ! 962 943 ! ! ------------ ! 963 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lwxios)944 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:) ) 964 945 ENDIF 965 946 ! 966 IF( lwxios ) CALL iom_swap( cxios_context )967 947 ENDIF 968 948 !
Note: See TracChangeset
for help on using the changeset viewer.