Changeset 12574 for NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/IOM
- Timestamp:
- 2020-03-19T15:52:52+01:00 (4 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/IOM
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/IOM/in_out_manager.F90
r11717 r12574 28 28 LOGICAL :: ln_rstart !: start from (F) rest or (T) a restart file 29 29 LOGICAL :: ln_rst_list !: output restarts at list of times (T) or by frequency (F) 30 LOGICAL :: ln_rst_eos !: check equation of state used for the restart is consistent with model 30 31 INTEGER :: nn_rstctl !: control of the time step (0, 1 or 2) 31 32 INTEGER :: nn_rstssh = 0 !: hand made initilization of ssh or not (1/0) -
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/IOM/iom.F90
r11715 r12574 362 362 !from restart.F90 363 363 CALL iom_set_rstw_var_active("rdt") 364 CALL iom_set_rstw_var_active("neos") 365 364 366 IF ( .NOT. ln_diurnal_only ) THEN 365 367 CALL iom_set_rstw_var_active('ub' ) … … 411 413 i = 0 412 414 i = i + 1; fields(i)%vname="rdt"; fields(i)%grid="grid_scalar" 415 i = i + 1; fields(i)%vname="neos"; fields(i)%grid="grid_scalar" 413 416 i = i + 1; fields(i)%vname="un"; fields(i)%grid="grid_N_3D" 414 417 i = i + 1; fields(i)%vname="ub"; fields(i)%grid="grid_N_3D" -
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/IOM/restart.F90
r11717 r12574 184 184 END IF 185 185 ENDIF 186 CALL iom_rstput( kt, nitrst, numrow, 'neos' , REAL(neos) , ldxios = lwxios) ! equation of state 187 !CALL iom_rstput( kt, nitrst, numrow, 'neos' , neos , ktype = jp_i1, ldxios = lwxios) ! equation of state 188 186 189 187 190 IF (ln_diurnal) CALL iom_rstput( kt, nitrst, numrow, 'Dsst', x_dsst, ldxios = lwxios ) … … 260 263 !!---------------------------------------------------------------------- 261 264 REAL(wp) :: zrdt 265 REAL(wp) :: zeos 262 266 INTEGER :: jk 263 267 REAL(wp), DIMENSION(jpi, jpj, jpk) :: w3d … … 266 270 CALL rst_read_open ! open restart for reading (if not already opened) 267 271 272 IF ( ln_rst_eos ) THEN 273 ! Check equation of state used is consistent with the restart 274 IF( iom_varid( numror, 'neos') == -1) THEN 275 CALL ctl_stop( 'restart, rst_read: variable neos not found. STOP check that the equations of state in the restart file and in the namelist nameos are consistent and use ln_rst_eos=F') 276 ELSE 277 CALL iom_get( numror, 'neos', zeos, ldxios = lrxios ) 278 IF ( INT(zeos) /= neos ) CALL ctl_stop( 'restart, rst_read: equation of state used in restart file differs from namelist nameos') 279 ENDIF 280 ENDIF 281 268 282 ! Check dynamics and tracer time-step consistency and force Euler restart if changed 269 IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 ) THEN 283 IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 ) THEN 270 284 CALL iom_get( numror, 'rdt', zrdt, ldxios = lrxios ) 271 285 IF( zrdt /= rdt ) neuler = 0
Note: See TracChangeset
for help on using the changeset viewer.