- Timestamp:
- 2020-12-02T18:22:24+01:00 (3 years ago)
- Location:
- NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3
- Property svn:externals
-
old new 8 8 9 9 # SETTE 10 ^/utils/CI/sette@13 559sette10 ^/utils/CI/sette@13795 sette
-
- Property svn:externals
-
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/domvvl.F90
r13998 r14018 282 282 ENDIF 283 283 ! 284 IF(lwxios) THEN285 ! define variables in restart file when writing with XIOS286 CALL iom_set_rstw_var_active('e3t_b')287 CALL iom_set_rstw_var_active('e3t_n')288 ! ! ----------------------- !289 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases !290 ! ! ----------------------- !291 CALL iom_set_rstw_var_active('tilde_e3t_b')292 CALL iom_set_rstw_var_active('tilde_e3t_n')293 END IF294 ! ! -------------!295 IF( ln_vvl_ztilde ) THEN ! z_tilde case !296 ! ! ------------ !297 CALL iom_set_rstw_var_active('hdiv_lf')298 ENDIF299 !300 ENDIF301 !302 284 END SUBROUTINE dom_vvl_zgr 303 285 … … 825 807 ! !* scale factors 826 808 IF(lwp) WRITE(numout,*) ' Kmm scale factor read in the restart file' 827 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) , ldxios = lrxios)809 CALL iom_get( numror, jpdom_auto, 'e3t_n', e3t(:,:,:,Kmm) ) 828 810 WHERE ( tmask(:,:,:) == 0.0_wp ) 829 811 e3t(:,:,:,Kmm) = e3t_0(:,:,:) … … 834 816 ELSE ! leap frog 835 817 IF(lwp) WRITE(numout,*) ' Kbb scale factor read in the restart file' 836 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) , ldxios = lrxios)818 CALL iom_get( numror, jpdom_auto, 'e3t_b', e3t(:,:,:,Kbb) ) 837 819 WHERE ( tmask(:,:,:) == 0.0_wp ) 838 820 e3t(:,:,:,Kbb) = e3t_0(:,:,:) … … 851 833 IF( id4 > 0 ) THEN !* scale factor increments 852 834 IF(lwp) WRITE(numout,*) ' Kmm scale factor increments read in the restart file' 853 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:) , ldxios = lrxios)835 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_n', tilde_e3t_n(:,:,:) ) 854 836 IF( l_1st_euler ) THEN ! euler 855 837 IF(lwp) WRITE(numout,*) ' Euler first time step : tilde_e3t(Kbb) = tilde_e3t(Kmm)' … … 857 839 ELSE ! leap frog 858 840 IF(lwp) WRITE(numout,*) ' Kbb scale factor increments read in the restart file' 859 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:) , ldxios = lrxios)841 CALL iom_get( numror, jpdom_auto, 'tilde_e3t_b', tilde_e3t_b(:,:,:) ) 860 842 ENDIF 861 843 ELSE … … 867 849 ! ! ------------ ! 868 850 IF( id5 > 0 ) THEN ! required array exists 869 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lrxios)851 CALL iom_get( numror, jpdom_auto, 'hdiv_lf', hdiv_lf(:,:,:) ) 870 852 ELSE ! array is missing 871 853 hdiv_lf(:,:,:) = 0.0_wp … … 892 874 ! 893 875 IF(lwp) WRITE(numout,*) '---- dom_vvl_rst ----' 894 IF( lwxios ) CALL iom_swap( cwxios_context )895 876 ! ! --------- ! 896 877 ! ! all cases ! 897 878 ! ! --------- ! 898 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t(:,:,:,Kbb) , ldxios = lwxios)899 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t(:,:,:,Kmm) , ldxios = lwxios)879 CALL iom_rstput( kt, nitrst, numrow, 'e3t_b', e3t(:,:,:,Kbb) ) 880 CALL iom_rstput( kt, nitrst, numrow, 'e3t_n', e3t(:,:,:,Kmm) ) 900 881 ! ! ----------------------- ! 901 882 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases ! 902 883 ! ! ----------------------- ! 903 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:) , ldxios = lwxios)904 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:) , ldxios = lwxios)884 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_b', tilde_e3t_b(:,:,:)) 885 CALL iom_rstput( kt, nitrst, numrow, 'tilde_e3t_n', tilde_e3t_n(:,:,:)) 905 886 END IF 906 887 ! ! -------------! 907 888 IF( ln_vvl_ztilde ) THEN ! z_tilde case ! 908 889 ! ! ------------ ! 909 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:) , ldxios = lwxios)890 CALL iom_rstput( kt, nitrst, numrow, 'hdiv_lf', hdiv_lf(:,:,:)) 910 891 ENDIF 911 892 ! 912 IF( lwxios ) CALL iom_swap( cxios_context )913 893 ENDIF 914 894 !
Note: See TracChangeset
for help on using the changeset viewer.