Changeset 3264 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC
- Timestamp:
- 2012-01-17T15:47:51+01:00 (12 years ago)
- Location:
- branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
r3263 r3264 216 216 IF( nn_dyn2d_dta(ib_bdy) .eq. 1 .or. nn_dyn2d_dta(ib_bdy) .eq. 3 ) THEN ! update external data 217 217 jend = jstart + 2 218 CALL fld_read( kt=kt, kn_fsbc=1, sd=bf(jstart:jend), map=nbmap_ptr(jstart:jend), jit=jit, time_offset=time_offset ) 218 CALL fld_read( kt=kt, kn_fsbc=1, sd=bf(jstart:jend), map=nbmap_ptr(jstart:jend), & 219 & jit=jit, time_offset=time_offset ) 219 220 ENDIF 220 221 IF( nn_dyn2d_dta(ib_bdy) .ge. 2 ) THEN ! update tidal harmonic forcing 221 CALL tide_update( kt=kt, idx=idx_bdy(ib_bdy), dta=dta_bdy(ib_bdy), td=tides(ib_bdy), jit=jit, time_offset=time_offset ) 222 CALL tide_update( kt=kt, idx=idx_bdy(ib_bdy), dta=dta_bdy(ib_bdy), td=tides(ib_bdy), & 223 & jit=jit, time_offset=time_offset ) 222 224 ENDIF 223 225 ENDIF … … 385 387 ln_full_vel = .false. 386 388 ! ... default values (NB: frequency positive => hours, negative => months) 387 ! ! file ! frequency ! variable 388 ! ! name ! (hours) ! name ! (T/F)! (T/F) ! 'monthly' ! filename ! pairs !389 bn_ssh = FLD_N( 'bdy_ssh' , 24 , 'sossheig' , .false., .false. , 'yearly' , '' , '' )390 bn_u2d = FLD_N( 'bdy_vel2d_u' , 24 , 'vobtcrtx' , .false., .false. , 'yearly' , '' , '' )391 bn_v2d = FLD_N( 'bdy_vel2d_v' , 24 , 'vobtcrty' , .false., .false. , 'yearly' , '' , '' )392 bn_u3d = FLD_N( 'bdy_vel3d_u' , 24 , 'vozocrtx' , .false., .false. , 'yearly' , '' , '' )393 bn_v3d = FLD_N( 'bdy_vel3d_v' , 24 , 'vomecrty' , .false., .false. , 'yearly' , '' , '' )394 bn_tem = FLD_N( 'bdy_tem' , 24 , 'votemper' , .false., .false. , 'yearly' , '' , '' )395 bn_sal = FLD_N( 'bdy_sal' , 24 , 'vosaline' , .false., .false. , 'yearly' , '' , '' )396 #if defined key_lim2 397 bn_frld = FLD_N( 'bdy_frld' , 24 , 'ildsconc' , .false., .false. , 'yearly' , '' , '' )398 bn_hicif = FLD_N( 'bdy_hicif' , 24 , 'iicethic' , .false., .false. , 'yearly' , '' , '' )399 bn_hsnif = FLD_N( 'bdy_hsnif' , 24 , 'isnothic' , .false., .false. , 'yearly' , '' , '' )389 ! ! file ! frequency ! variable ! time intep ! clim ! 'yearly' or ! weights ! rotation ! 390 ! ! name ! hours ! name ! (T/F) ! (T/F) ! 'monthly' ! filename ! pairs ! 391 bn_ssh = FLD_N( 'bdy_ssh' , 24 , 'sossheig' , .false. , .false. , 'yearly' , '' , '' ) 392 bn_u2d = FLD_N( 'bdy_vel2d_u' , 24 , 'vobtcrtx' , .false. , .false. , 'yearly' , '' , '' ) 393 bn_v2d = FLD_N( 'bdy_vel2d_v' , 24 , 'vobtcrty' , .false. , .false. , 'yearly' , '' , '' ) 394 bn_u3d = FLD_N( 'bdy_vel3d_u' , 24 , 'vozocrtx' , .false. , .false. , 'yearly' , '' , '' ) 395 bn_v3d = FLD_N( 'bdy_vel3d_v' , 24 , 'vomecrty' , .false. , .false. , 'yearly' , '' , '' ) 396 bn_tem = FLD_N( 'bdy_tem' , 24 , 'votemper' , .false. , .false. , 'yearly' , '' , '' ) 397 bn_sal = FLD_N( 'bdy_sal' , 24 , 'vosaline' , .false. , .false. , 'yearly' , '' , '' ) 398 #if defined key_lim2 399 bn_frld = FLD_N( 'bdy_frld' , 24 , 'ildsconc' , .false. , .false. , 'yearly' , '' , '' ) 400 bn_hicif = FLD_N( 'bdy_hicif' , 24 , 'iicethic' , .false. , .false. , 'yearly' , '' , '' ) 401 bn_hsnif = FLD_N( 'bdy_hsnif' , 24 , 'isnothic' , .false. , .false. , 'yearly' , '' , '' ) 400 402 #endif 401 403 … … 576 578 DO ib_bdy = 1, nb_bdy 577 579 jend = jstart + nb_bdy_fld(ib_bdy) - 1 578 CALL fld_fill( bf(jstart:jend), blf_i(jstart:jend), cn_dir_array(ib_bdy), 'bdy_dta', 'open boundary conditions', 'nambdy_dta' ) 580 CALL fld_fill( bf(jstart:jend), blf_i(jstart:jend), cn_dir_array(ib_bdy), 'bdy_dta', & 581 & 'open boundary conditions', 'nambdy_dta' ) 579 582 jstart = jend + 1 580 583 ENDDO -
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
r3191 r3264 555 555 IF( nbrdta(ib,igrd,ib_bdy) < nbrdta(ibm1,igrd,ib_bdy) ) THEN 556 556 CALL ctl_stop('bdy_init : ERROR : boundary data in file must be defined in order of distance from edge nbr.', & 557 557 'A utility for re-ordering boundary coordinates and data files exists in the TOOLS/OBC directory') 558 558 ENDIF 559 559 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.