Changeset 8661
- Timestamp:
- 2017-10-26T12:06:21+02:00 (7 years ago)
- Location:
- branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 7 edited
-
DOM/daymod.F90 (modified) (4 diffs)
-
DOM/domain.F90 (modified) (1 diff)
-
DYN/dynspg_ts.F90 (modified) (2 diffs)
-
IOM/in_out_manager.F90 (modified) (1 diff)
-
IOM/iom.F90 (modified) (2 diffs)
-
IOM/restart.F90 (modified) (4 diffs)
-
TRA/traadv.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90
r8651 r8661 349 349 ndastp = NINT( zndastp ) 350 350 CALL iom_get( numror, 'adatrj', adatrj ) 351 352 351 CALL iom_get( numror, 'ntime', ktime ) 352 nn_time0=INT(ktime) 353 353 ! calculate start time in hours and minutes 354 355 ksecs = NINT(zdayfrac*86400)! Nearest second to catch rounding errors in adatrj356 357 358 354 zdayfrac=adatrj-INT(adatrj) 355 ksecs = NINT(zdayfrac*86400) ! Nearest second to catch rounding errors in adatrj 356 ihour = INT(ksecs/3600) 357 iminute = ksecs/60-ihour*60 358 359 359 ! Add to nn_time0 360 360 nhour = nn_time0 / 100 361 361 nminute = ( nn_time0 - nhour * 100 ) 362 363 364 365 366 367 368 369 370 371 372 ENDIF373 374 362 nminute=nminute+iminute 363 364 IF( nminute >= 60 ) THEN 365 nminute=nminute-60 366 nhour=nhour+1 367 ENDIF 368 nhour=nhour+ihour 369 IF( nhour >= 24 ) THEN 370 nhour=nhour-24 371 adatrj=adatrj+1 372 ENDIF 373 nn_time0 = nhour * 100 + nminute 374 adatrj = INT(adatrj) ! adatrj set to integer as nn_time0 updated 375 375 ELSE 376 376 ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day) … … 386 386 ndastp = ndate0 ! ndate0 read in the namelist in dom_nam 387 387 nhour = nn_time0 / 100 388 388 nminute = ( nn_time0 - nhour * 100 ) 389 389 IF( nhour*3600+nminute*60-ndt05 .lt. 0 ) ndastp=ndastp-1 ! Start hour is specified in the namelist (default 0) 390 390 adatrj = ( REAL( nit000-1, wp ) * rdt ) / rday … … 396 396 WRITE(numout,*) ' date ndastp : ', ndastp 397 397 WRITE(numout,*) ' number of elapsed days since the begining of run : ', adatrj 398 398 WRITE(numout,*) ' nn_time0 : ',nn_time0 399 399 WRITE(numout,*) 400 400 ENDIF … … 413 413 CALL iom_rstput( kt, nitrst, numrow, 'adatrj' , adatrj, lxios = lwxios ) ! number of elapsed days since 414 414 ! ! the begining of the run [s] 415 415 CALL iom_rstput( kt, nitrst, numrow, 'ntime' , REAL( nn_time0, wp), lxios = lwxios ) ! time 416 416 IF( lwxios ) CALL iom_swap( cxios_context ) 417 417 ENDIF -
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
r8651 r8661 49 49 USE iom_def, ONLY:lwxios, wxioso, rst_wfields ! write restart flag and output type 50 50 USE iom, ONLY : iom_set_rst_vars, iom_set_rstw_core 51 51 52 IMPLICIT NONE 52 53 PRIVATE -
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r8651 r8661 138 138 INTEGER, INTENT(in) :: kt ! ocean time-step index 139 139 ! 140 LOGICAL :: ll_fw_start 141 LOGICAL :: ll_init 140 LOGICAL :: ll_fw_start ! if true, forward integration 141 LOGICAL :: ll_init ! if true, special startup of 2d equations 142 142 LOGICAL :: ll_tmp1, ll_tmp2 ! local logical variables used in W/D 143 INTEGER :: ji, jj, jk, jn 144 INTEGER :: ikbu, ikbv, noffset 145 INTEGER :: iktu, iktv 143 INTEGER :: ji, jj, jk, jn ! dummy loop indices 144 INTEGER :: ikbu, ikbv, noffset ! local integers 145 INTEGER :: iktu, iktv ! local integers 146 146 REAL(wp) :: zmdi 147 REAL(wp) :: zraur, z1_2dt_b, z2dt_bf 147 REAL(wp) :: zraur, z1_2dt_b, z2dt_bf ! local scalars 148 148 REAL(wp) :: zx1, zy1, zx2, zy2 ! - - 149 REAL(wp) :: z1_12, z1_8, z1_4, z1_2 149 REAL(wp) :: z1_12, z1_8, z1_4, z1_2 ! - - 150 150 REAL(wp) :: zu_spg, zv_spg ! - - 151 REAL(wp) :: zhura, zhvra 152 REAL(wp) :: za0, za1, za2, za3 151 REAL(wp) :: zhura, zhvra ! - - 152 REAL(wp) :: za0, za1, za2, za3 ! - - 153 153 ! 154 154 REAL(wp), POINTER, DIMENSION(:,:) :: zsshp2_e … … 192 192 ENDIF 193 193 ! 194 IF( kt == nit000 ) THEN 194 IF( kt == nit000 ) THEN !* initialisation 195 195 ! 196 196 IF(lwp) WRITE(numout,*) -
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90
r8630 r8661 45 45 INTEGER :: nn_chunksz !: chunksize (bytes) for NetCDF file (works only with iom_nf90 routines) 46 46 INTEGER :: nn_wxios !: write resart using xios 0 - no, 1 - single, 2 - multiple file output 47 47 48 #if defined key_netcdf4 48 49 !!---------------------------------------------------------------------- -
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r8652 r8661 182 182 CALL iom_set_axis_attr( "depthu", paxis = gdept_1d ) 183 183 CALL iom_set_axis_attr( "depthv", paxis = gdept_1d ) 184 CALL iom_set_axis_attr( "depthw", paxis =gdepw_1d )184 CALL iom_set_axis_attr( "depthw", gdepw_1d ) 185 185 186 186 ! Add vertical grid bounds … … 229 229 230 230 #endif 231 231 232 232 END SUBROUTINE iom_init 233 233 -
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r8644 r8661 65 65 !!---------------------------------------------------------------------- 66 66 ! 67 68 67 IF( kt == nit000 ) THEN ! default definitions 69 68 lrst_oce = .FALSE. … … 85 84 ! we open and define the ocean restart file one time step before writing the data (-> at nitrst - 1) 86 85 ! except if we write ocean restart files every time step or if an ocean restart file was writen at nitend - 1 87 ! NO, because the data is written 2 times on nitrst - 1 and nitrst88 86 IF( kt == nitrst - 1 .OR. nstock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) ) THEN 89 87 IF( nitrst <= nitend .AND. nitrst > 0 ) THEN … … 126 124 ENDIF 127 125 ENDIF 128 129 126 ! 130 127 END SUBROUTINE rst_opn … … 288 285 ! 289 286 END SUBROUTINE rst_read 287 290 288 !!===================================================================== 291 289 END MODULE restart -
branches/2017/dev_r8600_xios_write/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r8644 r8661 45 45 PUBLIC tra_adv ! routine called by step module 46 46 PUBLIC tra_adv_init ! routine called by opa module 47 47 48 ! !!* Namelist namtra_adv * 48 49 LOGICAL :: ln_traadv_cen ! centered scheme flag
Note: See TracChangeset
for help on using the changeset viewer.
