Changeset 11923 for NEMO/branches/2019/dev_r11756_SI3restart_XIOS
- Timestamp:
- 2019-11-18T09:38:39+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11756_SI3restart_XIOS
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/ICE/icerst.F90
r11901 r11923 226 226 TRIM(cn_icerst_indir)//'/'//TRIM(Agrif_CFixed())//"_"//cn_icerst_in, ld_tmppatch = .false. ) 227 227 ELSE 228 IF(lwp) WRITE(numout,*) 'Enable SI3 restart reading by XIOS for AGRIF'228 IF(lwp) WRITE(numout,*) 'Enable SI3 restart reading by XIOS' 229 229 CALL iom_init( crixios_context, TRIM(cn_icerst_indir)//'/'//cn_icerst_in, ld_tmppatch = .false. ) 230 230 ENDIF -
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/DOM/domain.F90
r11901 r11923 126 126 CALL iom_set_rstw_core(rst_wfields, cdstr) 127 127 ENDIF 128 !reset namelist for SAS129 IF(cdstr == 'SAS') THEN130 IF(lrxios) THEN131 IF(lwp) write(numout,*) 'Disable reading restart file using XIOS for SAS'132 lrxios = .FALSE.133 ENDIF134 ENDIF135 128 ! 136 129 CALL dom_hgr ! Horizontal mesh -
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/OCE/IOM/iom.F90
r11901 r11923 71 71 PRIVATE set_grid, set_grid_bounds, set_scalar, set_xmlatt, set_mooring, iom_update_file_name, iom_sdate 72 72 PRIVATE iom_set_rst_context, iom_set_rstw_active, iom_set_rstr_active 73 PRIVATE iom_add 73 74 # endif 74 75 PRIVATE iom_define_restartw, iom_set_rstw_validate 75 76 PUBLIC iom_set_rstw_var_active, iom_set_rstw_core, iom_set_rst_vars 76 PRIVATE iom_add77 77 INTEGER, PRIVATE :: numrst 78 78 CHARACTER(len=12), PRIVATE :: snr … … 569 569 CHARACTER(len=2) :: zchar 570 570 CHARACTER(len=25) :: znam 571 571 #if defined key_iomput 572 572 i = 0 573 573 i = iom_add(i); fields(i)%vname="rdt"; fields(i)%grid="grid_scalar" … … 798 798 i = iom_add(i); fields(i)%vname="snwice_mass_b"; fields(i)%grid="grid_N" 799 799 #endif 800 #endif 800 801 END SUBROUTINE iom_set_rst_vars 801 802 -
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/SAS/nemogcm.F90
r11536 r11923 194 194 ELSE ; cxios_context = 'nemo' 195 195 ENDIF 196 cwxios_context = 'nemo_rstw' 196 197 ! 197 198 ! !-------------------------------------------------! -
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/src/SAS/step.F90
r11837 r11923 88 88 indic = 0 ! although indic is not changed in stp_ctl 89 89 ! need to keep the same interface 90 IF( kstp == nit000 ) CALL iom_init( cxios_context ) ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 90 IF( kstp == nit000 ) THEN 91 CALL iom_init( cxios_context ) ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 92 IF( lwxios ) CALL iom_init( cwxios_context ) ! restart write context 93 ENDIF 91 94 IF( kstp /= nit000 ) CALL day( kstp ) ! Calendar (day was already called at nit000 in day_init) 92 95 CALL iom_setkt( kstp - nit000 + 1, cxios_context ) ! tell iom we are at time step kstp … … 134 137 IF(.NOT.lwxios) THEN 135 138 CALL iom_close( numrow ) 136 ELSE137 CALL iom_context_finalize( cwxios_context )138 139 ENDIF 139 140 lrst_oce = .FALSE. … … 146 147 CALL iom_context_finalize( crxios_context) 147 148 ENDIF 149 150 IF(lwxios) CALL iom_context_finalize( cwxios_context ) 151 148 152 CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF 149 153 ENDIF -
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/tests/ICE_AGRIF/EXPREF/iodef.xml
r9509 r11923 28 28 <context id="nemo" src="./context_nemo.xml"/> <!-- NEMO --> 29 29 <context id="1_nemo" src="./1_context_nemo.xml"/> 30 <context id="nemo_rstw" src="./nemo_rstw.xml"/> 31 <context id="si3_rst" src="./si3_rst.xml"/> 32 <context id="1_nemo_rstw" src="./1_nemo_rstw.xml"/> 33 <context id="1_si3_rst" src="./1_si3_rst.xml"/> 34 30 35 <!-- 31 36 <context id="2_nemo" src="./2_context_nemo.xml"/> -
NEMO/branches/2019/dev_r11756_SI3restart_XIOS/tests/VORTEX/MY_SRC/domvvl.F90
r11536 r11923 247 247 IF(lwxios) THEN 248 248 ! define variables in restart file when writing with XIOS 249 CALL iom_set_rstw_var_active( 'e3t_b')250 CALL iom_set_rstw_var_active( 'e3t_n')249 CALL iom_set_rstw_var_active(rst_wfields, 'e3t_b') 250 CALL iom_set_rstw_var_active(rst_wfields, 'e3t_n') 251 251 ! ! ----------------------- ! 252 252 IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN ! z_tilde and layer cases ! 253 253 ! ! ----------------------- ! 254 CALL iom_set_rstw_var_active( 'tilde_e3t_b')255 CALL iom_set_rstw_var_active( 'tilde_e3t_n')254 CALL iom_set_rstw_var_active(rst_wfields, 'tilde_e3t_b') 255 CALL iom_set_rstw_var_active(rst_wfields, 'tilde_e3t_n') 256 256 END IF 257 257 ! ! -------------! 258 258 IF( ln_vvl_ztilde ) THEN ! z_tilde case ! 259 259 ! ! ------------ ! 260 CALL iom_set_rstw_var_active( 'hdiv_lf')260 CALL iom_set_rstw_var_active(rst_wfields, 'hdiv_lf') 261 261 ENDIF 262 262 ! … … 806 806 IF( ln_rstart ) THEN !* Read the restart file 807 807 CALL rst_read_open ! open the restart file if necessary 808 IF(lrxios) CALL iom_swap(crxios_context) 808 809 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn, ldxios = lrxios ) 809 810 ! … … 881 882 ENDIF 882 883 ! 884 IF(lrxios) CALL iom_swap(cxios_context) 885 ! 883 886 ELSE !* Initialize at "rest" 884 887 !
Note: See TracChangeset
for help on using the changeset viewer.