Changeset 4292 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM
- Timestamp:
- 2013-11-20T17:28:04+01:00 (10 years ago)
- Location:
- branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r4245 r4292 136 136 137 137 ! vertical grid definition 138 CALL iom_set_axis_attr( "deptht", gdept_ 0)139 CALL iom_set_axis_attr( "depthu", gdept_ 0)140 CALL iom_set_axis_attr( "depthv", gdept_ 0)141 CALL iom_set_axis_attr( "depthw", gdepw_ 0)138 CALL iom_set_axis_attr( "deptht", gdept_1d ) 139 CALL iom_set_axis_attr( "depthu", gdept_1d ) 140 CALL iom_set_axis_attr( "depthv", gdept_1d ) 141 CALL iom_set_axis_attr( "depthw", gdepw_1d ) 142 142 # if defined key_floats 143 143 CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,nfloat) /) ) -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_ioipsl.F90
r4245 r4292 408 408 CALL flioputv( ioipslid, 'nav_lon' , glamt(ix1:ix2, iy1:iy2) ) 409 409 CALL flioputv( ioipslid, 'nav_lat' , gphit(ix1:ix2, iy1:iy2) ) 410 CALL flioputv( ioipslid, 'nav_lev' , gdept_ 0)410 CALL flioputv( ioipslid, 'nav_lev' , gdept_1d ) 411 411 ! +++ WRONG VALUE: to be improved but not really useful... 412 412 CALL flioputv( ioipslid, 'time_counter', kt ) -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90
r4245 r4292 532 532 CALL iom_nf90_check(NF90_PUT_VAR( if90id, idmy, gphit(ix1:ix2, iy1:iy2) ), clinfo) 533 533 CALL iom_nf90_check(NF90_INQ_VARID( if90id, 'nav_lev' , idmy ), clinfo) 534 CALL iom_nf90_check(NF90_PUT_VAR( if90id, idmy, gdept_ 0), clinfo)534 CALL iom_nf90_check(NF90_PUT_VAR( if90id, idmy, gdept_1d ), clinfo) 535 535 ! +++ WRONG VALUE: to be improved but not really useful... 536 536 CALL iom_nf90_check(NF90_INQ_VARID( if90id, 'time_counter', idmy ), clinfo) -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r4206 r4292 23 23 USE eosbn2 ! equation of state (eos bn2 routine) 24 24 USE trdmld_oce ! ocean active mixed layer tracers trends variables 25 USE domvvl ! variable volume26 25 USE divcur ! hor. divergence and curl (div & cur routines) 27 26 USE sbc_ice, ONLY : lk_lim3 … … 30 29 PRIVATE 31 30 32 PUBLIC rst_opn ! routine called by step module 33 PUBLIC rst_write ! routine called by step module 34 PUBLIC rst_read ! routine called by opa module 31 PUBLIC rst_opn ! routine called by step module 32 PUBLIC rst_write ! routine called by step module 33 PUBLIC rst_read ! routine called by istate module 34 PUBLIC rst_read_open ! routine called in rst_read and (possibly) in dom_vvl_init 35 35 36 36 !! * Substitutions … … 120 120 CALL iom_rstput( kt, nitrst, numrow, 'hdivb' , hdivb ) 121 121 CALL iom_rstput( kt, nitrst, numrow, 'sshb' , sshb ) 122 IF( lk_vvl ) CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) )123 122 ! 124 123 CALL iom_rstput( kt, nitrst, numrow, 'un' , un ) ! now fields … … 144 143 END SUBROUTINE rst_write 145 144 145 SUBROUTINE rst_read_open 146 !!---------------------------------------------------------------------- 147 !! *** ROUTINE rst_read_open *** 148 !! 149 !! ** Purpose : Open read files for restart (format fixed by jprstlib ) 150 !! 151 !! ** Method : Use a non-zero, positive value of numror to assess whether or not 152 !! the file has already been opened 153 !!---------------------------------------------------------------------- 154 INTEGER :: jlibalt = jprstlib 155 LOGICAL :: llok 156 !!---------------------------------------------------------------------- 157 158 IF( numror .LE. 0 ) THEN 159 IF(lwp) THEN ! Contol prints 160 WRITE(numout,*) 161 SELECT CASE ( jprstlib ) 162 CASE ( jpnf90 ) ; WRITE(numout,*) 'rst_read : read oce NetCDF restart file' 163 CASE ( jprstdimg ) ; WRITE(numout,*) 'rst_read : read oce binary restart file' 164 END SELECT 165 IF ( snc4set%luse ) WRITE(numout,*) 'rst_read : configured with NetCDF4 support' 166 WRITE(numout,*) '~~~~~~~~' 167 ENDIF 168 169 IF ( jprstlib == jprstdimg ) THEN 170 ! eventually read netcdf file (monobloc) for restarting on different number of processors 171 ! if {cn_ocerst_in}.nc exists, then set jlibalt to jpnf90 172 INQUIRE( FILE = TRIM(cn_ocerst_in)//'.nc', EXIST = llok ) 173 IF ( llok ) THEN ; jlibalt = jpnf90 ; ELSE ; jlibalt = jprstlib ; ENDIF 174 ENDIF 175 CALL iom_open( cn_ocerst_in, numror, kiolib = jlibalt ) 176 ENDIF 177 END SUBROUTINE rst_read_open 146 178 147 179 SUBROUTINE rst_read … … 154 186 !!---------------------------------------------------------------------- 155 187 REAL(wp) :: zrdt, zrdttra1 156 INTEGER :: jk , jlibalt = jprstlib188 INTEGER :: jk 157 189 LOGICAL :: llok 158 190 !!---------------------------------------------------------------------- 159 191 160 IF(lwp) THEN ! Contol prints 161 WRITE(numout,*) 162 SELECT CASE ( jprstlib ) 163 CASE ( jpnf90 ) ; WRITE(numout,*) 'rst_read : read oce NetCDF restart file ',TRIM(cn_ocerst_in)//'.nc' 164 CASE ( jprstdimg ) ; WRITE(numout,*) 'rst_read : read oce binary restart file' 165 END SELECT 166 IF ( snc4set%luse ) WRITE(numout,*) 'rst_read : configured with NetCDF4 support' 167 WRITE(numout,*) '~~~~~~~~' 168 ENDIF 169 170 IF ( jprstlib == jprstdimg ) THEN 171 ! eventually read netcdf file (monobloc) for restarting on different number of processors 172 ! if {cn_ocerst_in}.nc exists, then set jlibalt to jpnf90 173 INQUIRE( FILE = TRIM(cn_ocerst_in)//'.nc', EXIST = llok ) 174 IF ( llok ) THEN ; jlibalt = jpnf90 ; ELSE ; jlibalt = jprstlib ; ENDIF 175 ENDIF 176 CALL iom_open( cn_ocerst_in, numror, kiolib = jlibalt ) 192 CALL rst_read_open ! open restart for reading (if not already opened) 177 193 178 194 ! Check dynamics and tracer time-step consistency and force Euler restart if changed … … 194 210 CALL iom_get( numror, jpdom_autoglo, 'hdivb' , hdivb ) 195 211 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb ) 196 IF( lk_vvl ) CALL iom_get( numror, jpdom_autoglo, 'fse3t_b', fse3t_b(:,:,:) )197 212 ELSE 198 213 neuler = 0 … … 230 245 hdivb(:,:,:) = hdivn(:,:,:) 231 246 sshb (:,:) = sshn (:,:) 232 IF( lk_vvl ) THEN233 DO jk = 1, jpk234 fse3t_b(:,:,jk) = fse3t_n(:,:,jk)235 END DO236 ENDIF237 247 ENDIF 238 248 !
Note: See TracChangeset
for help on using the changeset viewer.