Changeset 4294 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/CRS
- Timestamp:
- 2013-11-20T18:04:09+01:00 (10 years ago)
- Location:
- branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/CRS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90
r4187 r4294 238 238 DO jj = 1,jpj_crs 239 239 DO ji = 1,jpi_crs 240 zprt(ji,jj) = gdept (ji,jj,mbkt(ji,jj) ) * tmask(ji,jj,1)241 zprw(ji,jj) = gdepw (ji,jj,mbkt(ji,jj)+1) * tmask(ji,jj,1)240 zprt(ji,jj) = gdept_0(ji,jj,mbkt(ji,jj) ) * tmask(ji,jj,1) 241 zprw(ji,jj) = gdepw_0(ji,jj,mbkt(ji,jj)+1) * tmask(ji,jj,1) 242 242 END DO 243 243 END DO … … 246 246 ENDIF 247 247 248 CALL iom_rstput( 0, 0, inum4, 'gdept_ 0', gdept_0) ! ! reference z-coord.249 CALL iom_rstput( 0, 0, inum4, 'gdepw_ 0', gdepw_0)250 CALL iom_rstput( 0, 0, inum4, 'e3t_ 0' , e3t_0)251 CALL iom_rstput( 0, 0, inum4, 'e3w_ 0' , e3w_0)248 CALL iom_rstput( 0, 0, inum4, 'gdept_1d', gdept_1d ) ! ! reference z-coord. 249 CALL iom_rstput( 0, 0, inum4, 'gdepw_1d', gdepw_1d ) 250 CALL iom_rstput( 0, 0, inum4, 'e3t_1d' , e3t_1d ) 251 CALL iom_rstput( 0, 0, inum4, 'e3w_1d' , e3w_1d ) 252 252 253 253 CALL iom_rstput( 0, 0, inum4, 'ocean_volume_t', ocean_volume_crs_t ) … … 273 273 IF( ln_zco ) THEN 274 274 ! ! z-coordinate - full steps 275 CALL iom_rstput( 0, 0, inum4, 'gdept_ 0', gdept_0) ! ! depth276 CALL iom_rstput( 0, 0, inum4, 'gdepw_ 0', gdepw_0)277 CALL iom_rstput( 0, 0, inum4, 'e3t_ 0' , e3t_0) ! ! scale factors278 CALL iom_rstput( 0, 0, inum4, 'e3w_ 0' , e3w_0)275 CALL iom_rstput( 0, 0, inum4, 'gdept_1d', gdept_1d ) ! ! depth 276 CALL iom_rstput( 0, 0, inum4, 'gdepw_1d', gdepw_1d ) 277 CALL iom_rstput( 0, 0, inum4, 'e3t_1d' , e3t_1d ) ! ! scale factors 278 CALL iom_rstput( 0, 0, inum4, 'e3w_1d' , e3w_1d ) 279 279 ENDIF 280 280 ! ! ============================ -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90
r4154 r4294 210 210 DO ji = 1, jpi_crs 211 211 DO jj = 1, jpj_crs 212 IF( e3t_crs(ji,jj,jk) == 0._wp ) e3t_crs(ji,jj,jk) = e3t_ 0(jk)213 IF( e3w_crs(ji,jj,jk) == 0._wp ) e3w_crs(ji,jj,jk) = e3w_ 0(jk)214 IF( e3u_crs(ji,jj,jk) == 0._wp ) e3u_crs(ji,jj,jk) = e3t_ 0(jk)215 IF( e3v_crs(ji,jj,jk) == 0._wp ) e3v_crs(ji,jj,jk) = e3t_ 0(jk)212 IF( e3t_crs(ji,jj,jk) == 0._wp ) e3t_crs(ji,jj,jk) = e3t_1d(jk) 213 IF( e3w_crs(ji,jj,jk) == 0._wp ) e3w_crs(ji,jj,jk) = e3w_1d(jk) 214 IF( e3u_crs(ji,jj,jk) == 0._wp ) e3u_crs(ji,jj,jk) = e3t_1d(jk) 215 IF( e3v_crs(ji,jj,jk) == 0._wp ) e3v_crs(ji,jj,jk) = e3t_1d(jk) 216 216 ENDDO 217 217 ENDDO … … 219 219 220 220 ! 3.d.3 Vertical depth (meters) 221 CALL crs_dom_ope( gdept , 'MAX', 'T', tmask, gdept_crs, p_e3=zfse3t, psgn=1.0 )222 CALL crs_dom_ope( gdepw , 'MAX', 'W', tmask, gdepw_crs, p_e3=zfse3w, psgn=1.0 )221 CALL crs_dom_ope( gdept_0, 'MAX', 'T', tmask, gdept_crs, p_e3=zfse3t, psgn=1.0 ) 222 CALL crs_dom_ope( gdepw_0, 'MAX', 'W', tmask, gdepw_crs, p_e3=zfse3w, psgn=1.0 ) 223 223 224 224
Note: See TracChangeset
for help on using the changeset viewer.