Changeset 12969 for NEMO/branches/2020/dev_12905_xios_restart/src/ICE
- Timestamp:
- 2020-05-26T12:05:09+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_12905_xios_restart/src/ICE
- Files:
-
- 7 edited
-
ice.F90 (modified) (1 diff)
-
icedia.F90 (modified) (1 diff)
-
icedyn_adv_pra.F90 (modified) (2 diffs)
-
icedyn_rhg_evp.F90 (modified) (3 diffs)
-
icerst.F90 (modified) (8 diffs)
-
icestp.F90 (modified) (1 diff)
-
iceupdate.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/ice.F90
r12489 r12969 168 168 LOGICAL , PUBLIC :: ln_cndflx !: use conduction flux as surface boundary condition (instead of qsr and qns) 169 169 LOGICAL , PUBLIC :: ln_cndemulate !: emulate conduction flux (if not provided) 170 LOGICAL , PUBLIC :: lrixios !: use xios to read restart in SI3 170 171 ! ! Conduction flux as surface forcing or not 171 172 INTEGER, PUBLIC, PARAMETER :: np_cnd_OFF = 0 !: no forcing from conduction flux (ice thermodynamics forced via qsr and qns) -
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icedia.F90
r12957 r12969 221 221 IF( ln_rstart ) THEN !* Read the restart file 222 222 ! 223 IF(lr xios) CALL iom_swap(crixios_context)224 CALL iom_get( numrir, 'kt_ice' , ziter, ldxios = lr xios )223 IF(lrixios) CALL iom_swap(crixios_context) 224 CALL iom_get( numrir, 'kt_ice' , ziter, ldxios = lrixios ) 225 225 IF(lwp) WRITE(numout,*) 226 226 IF(lwp) WRITE(numout,*) 'ice_dia_rst read at time step = ', ziter 227 227 IF(lwp) WRITE(numout,*) '~~~~~~~~~~' 228 CALL iom_get( numrir, 'frc_voltop' , frc_voltop, ldxios = lr xios )229 CALL iom_get( numrir, 'frc_volbot' , frc_volbot, ldxios = lr xios )230 CALL iom_get( numrir, 'frc_temtop' , frc_temtop, ldxios = lr xios )231 CALL iom_get( numrir, 'frc_tembot' , frc_tembot, ldxios = lr xios )232 CALL iom_get( numrir, 'frc_sal' , frc_sal, ldxios = lr xios )233 CALL iom_get( numrir, jpdom_autoglo, 'vol_loc_ini', vol_loc_ini, ldxios = lr xios )234 CALL iom_get( numrir, jpdom_autoglo, 'tem_loc_ini', tem_loc_ini, ldxios = lr xios )235 CALL iom_get( numrir, jpdom_autoglo, 'sal_loc_ini', sal_loc_ini, ldxios = lr xios )236 IF(lr xios) CALL iom_swap(cxios_context)228 CALL iom_get( numrir, 'frc_voltop' , frc_voltop, ldxios = lrixios ) 229 CALL iom_get( numrir, 'frc_volbot' , frc_volbot, ldxios = lrixios ) 230 CALL iom_get( numrir, 'frc_temtop' , frc_temtop, ldxios = lrixios ) 231 CALL iom_get( numrir, 'frc_tembot' , frc_tembot, ldxios = lrixios ) 232 CALL iom_get( numrir, 'frc_sal' , frc_sal, ldxios = lrixios ) 233 CALL iom_get( numrir, jpdom_autoglo, 'vol_loc_ini', vol_loc_ini, ldxios = lrixios ) 234 CALL iom_get( numrir, jpdom_autoglo, 'tem_loc_ini', tem_loc_ini, ldxios = lrixios ) 235 CALL iom_get( numrir, jpdom_autoglo, 'sal_loc_ini', sal_loc_ini, ldxios = lrixios ) 236 IF(lrixios) CALL iom_swap(cxios_context) 237 237 ELSE 238 238 IF(lwp) WRITE(numout,*) -
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icedyn_adv_pra.F90
r12957 r12969 770 770 ! 771 771 IF( id1 > 0 ) THEN !** Read the restart file **! 772 IF(lr xios) CALL iom_swap(crixios_context)772 IF(lrixios) CALL iom_swap(crixios_context) 773 773 ! 774 774 ! ! ice thickness 775 CALL iom_get( numrir, jpdom_autoglo, 'sxice' , sxice, ldxios = lr xios )776 CALL iom_get( numrir, jpdom_autoglo, 'syice' , syice, ldxios = lr xios )777 CALL iom_get( numrir, jpdom_autoglo, 'sxxice', sxxice, ldxios = lr xios )778 CALL iom_get( numrir, jpdom_autoglo, 'syyice', syyice, ldxios = lr xios )779 CALL iom_get( numrir, jpdom_autoglo, 'sxyice', sxyice, ldxios = lr xios )775 CALL iom_get( numrir, jpdom_autoglo, 'sxice' , sxice, ldxios = lrixios ) 776 CALL iom_get( numrir, jpdom_autoglo, 'syice' , syice, ldxios = lrixios ) 777 CALL iom_get( numrir, jpdom_autoglo, 'sxxice', sxxice, ldxios = lrixios ) 778 CALL iom_get( numrir, jpdom_autoglo, 'syyice', syyice, ldxios = lrixios ) 779 CALL iom_get( numrir, jpdom_autoglo, 'sxyice', sxyice, ldxios = lrixios ) 780 780 ! ! snow thickness 781 CALL iom_get( numrir, jpdom_autoglo, 'sxsn' , sxsn, ldxios = lr xios )782 CALL iom_get( numrir, jpdom_autoglo, 'sysn' , sysn, ldxios = lr xios )783 CALL iom_get( numrir, jpdom_autoglo, 'sxxsn' , sxxsn, ldxios = lr xios )784 CALL iom_get( numrir, jpdom_autoglo, 'syysn' , syysn, ldxios = lr xios )785 CALL iom_get( numrir, jpdom_autoglo, 'sxysn' , sxysn, ldxios = lr xios )781 CALL iom_get( numrir, jpdom_autoglo, 'sxsn' , sxsn, ldxios = lrixios ) 782 CALL iom_get( numrir, jpdom_autoglo, 'sysn' , sysn, ldxios = lrixios ) 783 CALL iom_get( numrir, jpdom_autoglo, 'sxxsn' , sxxsn, ldxios = lrixios ) 784 CALL iom_get( numrir, jpdom_autoglo, 'syysn' , syysn, ldxios = lrixios ) 785 CALL iom_get( numrir, jpdom_autoglo, 'sxysn' , sxysn, ldxios = lrixios ) 786 786 ! ! ice concentration 787 CALL iom_get( numrir, jpdom_autoglo, 'sxa' , sxa, ldxios = lr xios )788 CALL iom_get( numrir, jpdom_autoglo, 'sya' , sya, ldxios = lr xios )789 CALL iom_get( numrir, jpdom_autoglo, 'sxxa' , sxxa, ldxios = lr xios )790 CALL iom_get( numrir, jpdom_autoglo, 'syya' , syya, ldxios = lr xios )791 CALL iom_get( numrir, jpdom_autoglo, 'sxya' , sxya, ldxios = lr xios )787 CALL iom_get( numrir, jpdom_autoglo, 'sxa' , sxa, ldxios = lrixios ) 788 CALL iom_get( numrir, jpdom_autoglo, 'sya' , sya, ldxios = lrixios ) 789 CALL iom_get( numrir, jpdom_autoglo, 'sxxa' , sxxa, ldxios = lrixios ) 790 CALL iom_get( numrir, jpdom_autoglo, 'syya' , syya, ldxios = lrixios ) 791 CALL iom_get( numrir, jpdom_autoglo, 'sxya' , sxya, ldxios = lrixios ) 792 792 ! ! ice salinity 793 CALL iom_get( numrir, jpdom_autoglo, 'sxsal' , sxsal, ldxios = lr xios )794 CALL iom_get( numrir, jpdom_autoglo, 'sysal' , sysal, ldxios = lr xios )795 CALL iom_get( numrir, jpdom_autoglo, 'sxxsal', sxxsal, ldxios = lr xios )796 CALL iom_get( numrir, jpdom_autoglo, 'syysal', syysal, ldxios = lr xios )797 CALL iom_get( numrir, jpdom_autoglo, 'sxysal', sxysal, ldxios = lr xios )793 CALL iom_get( numrir, jpdom_autoglo, 'sxsal' , sxsal, ldxios = lrixios ) 794 CALL iom_get( numrir, jpdom_autoglo, 'sysal' , sysal, ldxios = lrixios ) 795 CALL iom_get( numrir, jpdom_autoglo, 'sxxsal', sxxsal, ldxios = lrixios ) 796 CALL iom_get( numrir, jpdom_autoglo, 'syysal', syysal, ldxios = lrixios ) 797 CALL iom_get( numrir, jpdom_autoglo, 'sxysal', sxysal, ldxios = lrixios ) 798 798 ! ! ice age 799 CALL iom_get( numrir, jpdom_autoglo, 'sxage' , sxage, ldxios = lr xios )800 CALL iom_get( numrir, jpdom_autoglo, 'syage' , syage, ldxios = lr xios )801 CALL iom_get( numrir, jpdom_autoglo, 'sxxage', sxxage, ldxios = lr xios )802 CALL iom_get( numrir, jpdom_autoglo, 'syyage', syyage, ldxios = lr xios )803 CALL iom_get( numrir, jpdom_autoglo, 'sxyage', sxyage, ldxios = lr xios )799 CALL iom_get( numrir, jpdom_autoglo, 'sxage' , sxage, ldxios = lrixios ) 800 CALL iom_get( numrir, jpdom_autoglo, 'syage' , syage, ldxios = lrixios ) 801 CALL iom_get( numrir, jpdom_autoglo, 'sxxage', sxxage, ldxios = lrixios ) 802 CALL iom_get( numrir, jpdom_autoglo, 'syyage', syyage, ldxios = lrixios ) 803 CALL iom_get( numrir, jpdom_autoglo, 'sxyage', sxyage, ldxios = lrixios ) 804 804 ! ! snow layers heat content 805 805 DO jk = 1, nlay_s 806 806 WRITE(zchar1,'(I2.2)') jk 807 807 znam = 'sxc0'//'_l'//zchar1 808 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sxc0 (:,:,jk,:) = z3d(:,:,:)808 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sxc0 (:,:,jk,:) = z3d(:,:,:) 809 809 znam = 'syc0'//'_l'//zchar1 810 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; syc0 (:,:,jk,:) = z3d(:,:,:)810 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; syc0 (:,:,jk,:) = z3d(:,:,:) 811 811 znam = 'sxxc0'//'_l'//zchar1 812 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sxxc0(:,:,jk,:) = z3d(:,:,:)812 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sxxc0(:,:,jk,:) = z3d(:,:,:) 813 813 znam = 'syyc0'//'_l'//zchar1 814 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; syyc0(:,:,jk,:) = z3d(:,:,:)814 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; syyc0(:,:,jk,:) = z3d(:,:,:) 815 815 znam = 'sxyc0'//'_l'//zchar1 816 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sxyc0(:,:,jk,:) = z3d(:,:,:)816 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sxyc0(:,:,jk,:) = z3d(:,:,:) 817 817 END DO 818 818 ! ! ice layers heat content … … 820 820 WRITE(zchar1,'(I2.2)') jk 821 821 znam = 'sxe'//'_l'//zchar1 822 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sxe (:,:,jk,:) = z3d(:,:,:)822 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sxe (:,:,jk,:) = z3d(:,:,:) 823 823 znam = 'sye'//'_l'//zchar1 824 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sye (:,:,jk,:) = z3d(:,:,:)824 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sye (:,:,jk,:) = z3d(:,:,:) 825 825 znam = 'sxxe'//'_l'//zchar1 826 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sxxe(:,:,jk,:) = z3d(:,:,:)826 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sxxe(:,:,jk,:) = z3d(:,:,:) 827 827 znam = 'syye'//'_l'//zchar1 828 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; syye(:,:,jk,:) = z3d(:,:,:)828 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; syye(:,:,jk,:) = z3d(:,:,:) 829 829 znam = 'sxye'//'_l'//zchar1 830 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios ) ; sxye(:,:,jk,:) = z3d(:,:,:)830 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) ; sxye(:,:,jk,:) = z3d(:,:,:) 831 831 END DO 832 832 ! 833 833 IF( ln_pnd_H12 ) THEN ! melt pond fraction 834 CALL iom_get( numrir, jpdom_autoglo, 'sxap' , sxap, ldxios = lr xios )835 CALL iom_get( numrir, jpdom_autoglo, 'syap' , syap, ldxios = lr xios )836 CALL iom_get( numrir, jpdom_autoglo, 'sxxap', sxxap, ldxios = lr xios )837 CALL iom_get( numrir, jpdom_autoglo, 'syyap', syyap, ldxios = lr xios )838 CALL iom_get( numrir, jpdom_autoglo, 'sxyap', sxyap, ldxios = lr xios )834 CALL iom_get( numrir, jpdom_autoglo, 'sxap' , sxap, ldxios = lrixios ) 835 CALL iom_get( numrir, jpdom_autoglo, 'syap' , syap, ldxios = lrixios ) 836 CALL iom_get( numrir, jpdom_autoglo, 'sxxap', sxxap, ldxios = lrixios ) 837 CALL iom_get( numrir, jpdom_autoglo, 'syyap', syyap, ldxios = lrixios ) 838 CALL iom_get( numrir, jpdom_autoglo, 'sxyap', sxyap, ldxios = lrixios ) 839 839 ! ! melt pond volume 840 CALL iom_get( numrir, jpdom_autoglo, 'sxvp' , sxvp, ldxios = lr xios )841 CALL iom_get( numrir, jpdom_autoglo, 'syvp' , syvp, ldxios = lr xios )842 CALL iom_get( numrir, jpdom_autoglo, 'sxxvp', sxxvp, ldxios = lr xios )843 CALL iom_get( numrir, jpdom_autoglo, 'syyvp', syyvp, ldxios = lr xios )844 CALL iom_get( numrir, jpdom_autoglo, 'sxyvp', sxyvp, ldxios = lr xios )840 CALL iom_get( numrir, jpdom_autoglo, 'sxvp' , sxvp, ldxios = lrixios ) 841 CALL iom_get( numrir, jpdom_autoglo, 'syvp' , syvp, ldxios = lrixios ) 842 CALL iom_get( numrir, jpdom_autoglo, 'sxxvp', sxxvp, ldxios = lrixios ) 843 CALL iom_get( numrir, jpdom_autoglo, 'syyvp', syyvp, ldxios = lrixios ) 844 CALL iom_get( numrir, jpdom_autoglo, 'sxyvp', sxyvp, ldxios = lrixios ) 845 845 ENDIF 846 IF(lr xios) CALL iom_swap(cxios_context)846 IF(lrixios) CALL iom_swap(cxios_context) 847 847 ! 848 848 ELSE !** start rheology from rest **! -
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icedyn_rhg_evp.F90
r12957 r12969 839 839 IF( ln_rstart ) THEN !* Read the restart file 840 840 ! 841 IF(lr xios) CALL iom_swap(crixios_context)841 IF(lrixios) CALL iom_swap(crixios_context) 842 842 id1 = iom_varid( numrir, 'stress1_i' , ldstop = .FALSE. ) 843 843 id2 = iom_varid( numrir, 'stress2_i' , ldstop = .FALSE. ) … … 845 845 ! 846 846 IF( MIN( id1, id2, id3 ) > 0 ) THEN ! fields exist 847 CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i, ldxios = lr xios )848 CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i, ldxios = lr xios )849 CALL iom_get( numrir, jpdom_autoglo, 'stress12_i', stress12_i, ldxios = lr xios )847 CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i, ldxios = lrixios ) 848 CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i, ldxios = lrixios ) 849 CALL iom_get( numrir, jpdom_autoglo, 'stress12_i', stress12_i, ldxios = lrixios ) 850 850 ELSE ! start rheology from rest 851 851 IF(lwp) WRITE(numout,*) … … 855 855 stress12_i(:,:) = 0._wp 856 856 ENDIF 857 IF(lr xios) CALL iom_swap(cxios_context)857 IF(lrixios) CALL iom_swap(cxios_context) 858 858 ELSE !* Start from rest 859 859 IF(lwp) WRITE(numout,*) -
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icerst.F90
r12961 r12969 213 213 CALL iom_open ( TRIM(cn_icerst_indir)//'/'//cn_icerst_in, numrir ) 214 214 215 IF( lrxios .AND. .NOT. lxios_sini) STOP 'OCE and ICE restart must be in a single file'216 IF(lwp) write(numout, *) 'USE XIOS to read restart: ', lr xios215 lrixios = lrxios.AND.lxios_sini 216 IF(lwp) write(numout, *) 'USE XIOS to read restart: ', lrixios 217 217 IF(lwp) CALL FLUSH(numout) 218 IF( lr xios) THEN218 IF( lrixios) THEN 219 219 crixios_context = 'si3_rst' 220 220 IF(lwp) WRITE(numout,*) 'Enable restart reading by XIOS for SI3' … … 234 234 IF( id0 > 0 ) THEN ! == case of a normal restart == ! 235 235 ! ! ------------------------------ ! 236 IF(lr xios) CALL iom_swap(crixios_context)236 IF(lrixios) CALL iom_swap(crixios_context) 237 237 ! Time info 238 CALL iom_get( numrir, 'nn_fsbc', zfice, ldxios = lr xios )239 CALL iom_get( numrir, 'kt_ice' , ziter, ldxios = lr xios )238 CALL iom_get( numrir, 'nn_fsbc', zfice, ldxios = lrixios ) 239 CALL iom_get( numrir, 'kt_ice' , ziter, ldxios = lrixios ) 240 240 IF(lwp) WRITE(numout,*) ' read ice restart file at time step : ', ziter 241 241 IF(lwp) WRITE(numout,*) ' in any case we force it to nit000 - 1 : ', nit000 - 1 … … 252 252 253 253 ! --- mandatory fields --- ! 254 CALL iom_get( numrir, jpdom_autoglo, 'v_i' , v_i, ldxios = lr xios )255 CALL iom_get( numrir, jpdom_autoglo, 'v_s' , v_s, ldxios = lr xios )256 CALL iom_get( numrir, jpdom_autoglo, 'sv_i' , sv_i, ldxios = lr xios )257 CALL iom_get( numrir, jpdom_autoglo, 'a_i' , a_i, ldxios = lr xios )258 CALL iom_get( numrir, jpdom_autoglo, 't_su' , t_su, ldxios = lr xios )259 CALL iom_get( numrir, jpdom_autoglo, 'u_ice', u_ice, ldxios = lr xios )260 CALL iom_get( numrir, jpdom_autoglo, 'v_ice', v_ice, ldxios = lr xios )254 CALL iom_get( numrir, jpdom_autoglo, 'v_i' , v_i, ldxios = lrixios ) 255 CALL iom_get( numrir, jpdom_autoglo, 'v_s' , v_s, ldxios = lrixios ) 256 CALL iom_get( numrir, jpdom_autoglo, 'sv_i' , sv_i, ldxios = lrixios ) 257 CALL iom_get( numrir, jpdom_autoglo, 'a_i' , a_i, ldxios = lrixios ) 258 CALL iom_get( numrir, jpdom_autoglo, 't_su' , t_su, ldxios = lrixios ) 259 CALL iom_get( numrir, jpdom_autoglo, 'u_ice', u_ice, ldxios = lrixios ) 260 CALL iom_get( numrir, jpdom_autoglo, 'v_ice', v_ice, ldxios = lrixios ) 261 261 ! Snow enthalpy 262 262 DO jk = 1, nlay_s 263 263 WRITE(zchar1,'(I2.2)') jk 264 264 znam = 'e_s'//'_l'//zchar1 265 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios )265 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) 266 266 e_s(:,:,jk,:) = z3d(:,:,:) 267 267 END DO … … 270 270 WRITE(zchar1,'(I2.2)') jk 271 271 znam = 'e_i'//'_l'//zchar1 272 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lr xios )272 CALL iom_get( numrir, jpdom_autoglo, znam , z3d, ldxios = lrixios ) 273 273 e_i(:,:,jk,:) = z3d(:,:,:) 274 274 END DO … … 277 277 id1 = iom_varid( numrir, 'oa_i' , ldstop = .FALSE. ) 278 278 IF( id1 > 0 ) THEN ! fields exist 279 CALL iom_get( numrir, jpdom_autoglo, 'oa_i', oa_i, ldxios = lr xios )279 CALL iom_get( numrir, jpdom_autoglo, 'oa_i', oa_i, ldxios = lrixios ) 280 280 ELSE ! start from rest 281 281 IF(lwp) WRITE(numout,*) ' ==>> previous run without ice age output then set it to zero' … … 285 285 id2 = iom_varid( numrir, 'a_ip' , ldstop = .FALSE. ) 286 286 IF( id2 > 0 ) THEN ! fields exist 287 CALL iom_get( numrir, jpdom_autoglo, 'a_ip' , a_ip, ldxios = lr xios )288 CALL iom_get( numrir, jpdom_autoglo, 'v_ip' , v_ip, ldxios = lr xios )287 CALL iom_get( numrir, jpdom_autoglo, 'a_ip' , a_ip, ldxios = lrixios ) 288 CALL iom_get( numrir, jpdom_autoglo, 'v_ip' , v_ip, ldxios = lrixios ) 289 289 ELSE ! start from rest 290 290 IF(lwp) WRITE(numout,*) ' ==>> previous run without melt ponds output then set it to zero' … … 297 297 id4 = iom_varid( numrir, 't1_ice' , ldstop = .FALSE. ) 298 298 IF( id3 > 0 .AND. id4 > 0 ) THEN ! fields exist 299 CALL iom_get( numrir, jpdom_autoglo, 'cnd_ice', cnd_ice, ldxios = lr xios )300 CALL iom_get( numrir, jpdom_autoglo, 't1_ice' , t1_ice, ldxios = lr xios )299 CALL iom_get( numrir, jpdom_autoglo, 'cnd_ice', cnd_ice, ldxios = lrixios ) 300 CALL iom_get( numrir, jpdom_autoglo, 't1_ice' , t1_ice, ldxios = lrixios ) 301 301 ELSE ! start from rest 302 302 IF(lwp) WRITE(numout,*) ' ==>> previous run without conductivity output then set it to zero' … … 307 307 308 308 CALL iom_delay_rst( 'READ', 'ICE', numrir ) ! read only ice delayed global communication variables 309 IF(lr xios) CALL iom_swap(cxios_context)309 IF(lrixios) CALL iom_swap(cxios_context) 310 310 ! ! ---------------------------------- ! 311 311 ELSE ! == case of a simplified restart == ! -
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/icestp.F90
r12961 r12969 282 282 IF( ln_rstart ) THEN 283 283 CALL iom_close( numrir ) ! close input ice restart file 284 IF(lr xios) CALL iom_context_finalize( crixios_context )284 IF(lrixios) CALL iom_context_finalize( crixios_context ) 285 285 ENDIF 286 286 ! -
NEMO/branches/2020/dev_12905_xios_restart/src/ICE/iceupdate.F90
r12957 r12969 417 417 ! 418 418 IF( id1 > 0 ) THEN ! fields exist 419 IF(lr xios) CALL iom_swap(crixios_context)420 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass' , snwice_mass, ldxios = lr xios )421 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b, ldxios = lr xios )422 IF(lr xios) CALL iom_swap(cxios_context)419 IF(lrixios) CALL iom_swap(crixios_context) 420 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass' , snwice_mass, ldxios = lrixios ) 421 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b, ldxios = lrixios ) 422 IF(lrixios) CALL iom_swap(cxios_context) 423 423 ELSE ! start from rest 424 424 IF(lwp) WRITE(numout,*) ' ==>> previous run without snow-ice mass output then set it'
Note: See TracChangeset
for help on using the changeset viewer.
