Changeset 5539 for branches/UKMO/restart_datestamp/NEMOGCM/NEMO/TOP_SRC
- Timestamp:
- 2015-07-02T16:10:04+02:00 (9 years ago)
- Location:
- branches/UKMO/restart_datestamp/NEMOGCM/NEMO/TOP_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/restart_datestamp/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90
r5462 r5539 117 117 IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_dust > 1 ) ) THEN 118 118 CALL fld_read( kt, 1, sf_dust ) 119 dust(:,:) = sf_dust(1)%fnow(:,:,1) 119 IF( nn_ice_tr == -1 .AND. .NOT. ln_ironice ) THEN 120 dust(:,:) = sf_dust(1)%fnow(:,:,1) 121 ELSE 122 dust(:,:) = sf_dust(1)%fnow(:,:,1) * ( 1.0 - fr_i(:,:) ) 123 ENDIF 120 124 ENDIF 121 125 ENDIF -
branches/UKMO/restart_datestamp/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90
r5462 r5539 185 185 INTEGER, INTENT( in ) :: kt ! ocean time-step index 186 186 ! 187 INTEGER :: ji, jj, jk, jn, jl, jc ! dummy loop indicesa 187 INTEGER :: ji , jj, jk, jn, jl, jc ! dummy loop indicesa 188 INTEGER :: isrow ! local index 188 189 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrcdta ! 3D workspace 189 190 … … 201 202 ! 202 203 SELECT CASE ( jp_cfg ) 204 ! ! ======================= 205 CASE ( 1 ) ! eORCA_R1 configuration 206 ! ! ======================= 207 isrow = 332 - jpjglo 208 ! 209 ! Caspian Sea 210 nctsi1(1) = 332 ; nctsj1(1) = 243 - isrow 211 nctsi2(1) = 344 ; nctsj2(1) = 275 - isrow 212 ! 203 213 ! ! ======================= 204 214 CASE ( 2 ) ! ORCA_R2 configuration -
branches/UKMO/restart_datestamp/NEMOGCM/NEMO/TOP_SRC/trcrst.F90
r5462 r5539 207 207 ENDIF 208 208 209 CALL iom_open( TRIM(cn_trcrst_indir)//'/'//cn_trcrst_in, numrtr, kiolib = jlibalt ) 210 211 CALL iom_get ( numrtr, 'kt', zkt ) ! last time-step of previous run 212 213 IF(lwp) THEN 214 WRITE(numout,*) ' *** Info read in restart : ' 215 WRITE(numout,*) ' previous time-step : ', NINT( zkt ) 216 WRITE(numout,*) ' *** restart option' 217 SELECT CASE ( nn_rsttr ) 218 CASE ( 0 ) ; WRITE(numout,*) ' nn_rsttr = 0 : no control of nittrc000' 219 CASE ( 1 ) ; WRITE(numout,*) ' nn_rsttr = 1 : no control the date at nittrc000 (use ndate0 read in the namelist)' 220 CASE ( 2 ) ; WRITE(numout,*) ' nn_rsttr = 2 : calendar parameters read in restart' 221 END SELECT 222 WRITE(numout,*) 223 ENDIF 224 ! Control of date 225 IF( nittrc000 - NINT( zkt ) /= nn_dttrc .AND. nn_rsttr /= 0 ) & 226 & CALL ctl_stop( ' ===>>>> : problem with nittrc000 for the restart', & 227 & ' verify the restart file or rerun with nn_rsttr = 0 (namelist)' ) 228 IF( lk_offline ) THEN ! set the date in offline mode 229 ! Check dynamics and tracer time-step consistency and force Euler restart if changed 230 IF( iom_varid( numrtr, 'rdttrc1', ldstop = .FALSE. ) > 0 ) THEN 231 CALL iom_get( numrtr, 'rdttrc1', zrdttrc1 ) 232 IF( zrdttrc1 /= rdt * nn_dttrc ) neuler = 0 233 ENDIF 234 ! ! define ndastp and adatrj 235 IF( nn_rsttr == 2 ) THEN 209 IF( ln_rsttr ) THEN 210 CALL iom_open( TRIM(cn_trcrst_indir)//'/'//cn_trcrst_in, numrtr, kiolib = jlibalt ) 211 CALL iom_get ( numrtr, 'kt', zkt ) ! last time-step of previous run 212 213 IF(lwp) THEN 214 WRITE(numout,*) ' *** Info read in restart : ' 215 WRITE(numout,*) ' previous time-step : ', NINT( zkt ) 216 WRITE(numout,*) ' *** restart option' 217 SELECT CASE ( nn_rsttr ) 218 CASE ( 0 ) ; WRITE(numout,*) ' nn_rsttr = 0 : no control of nittrc000' 219 CASE ( 1 ) ; WRITE(numout,*) ' nn_rsttr = 1 : no control the date at nittrc000 (use ndate0 read in the namelist)' 220 CASE ( 2 ) ; WRITE(numout,*) ' nn_rsttr = 2 : calendar parameters read in restart' 221 END SELECT 222 WRITE(numout,*) 223 ENDIF 224 ! Control of date 225 IF( nittrc000 - NINT( zkt ) /= nn_dttrc .AND. nn_rsttr /= 0 ) & 226 & CALL ctl_stop( ' ===>>>> : problem with nittrc000 for the restart', & 227 & ' verify the restart file or rerun with nn_rsttr = 0 (namelist)' ) 228 ENDIF 229 ! 230 IF( lk_offline ) THEN 231 ! ! set the date in offline mode 232 IF( ln_rsttr .AND. nn_rsttr == 2 ) THEN 236 233 CALL iom_get( numrtr, 'ndastp', zndastp ) 237 234 ndastp = NINT( zndastp ) 238 235 CALL iom_get( numrtr, 'adatrj', adatrj ) 239 ELSE236 ELSE 240 237 ndastp = ndate0 - 1 ! ndate0 read in the namelist in dom_nam 241 238 adatrj = ( REAL( nittrc000-1, wp ) * rdttra(1) ) / rday … … 248 245 WRITE(numout,*) ' number of elapsed days since the begining of run : ', adatrj 249 246 WRITE(numout,*) 247 ENDIF 248 ! 249 IF( ln_rsttr ) THEN ; neuler = 1 250 ELSE ; neuler = 0 250 251 ENDIF 251 252 !
Note: See TracChangeset
for help on using the changeset viewer.