Changeset 7430 for branches/2016/dev_merge_2016
- Timestamp:
- 2016-12-02T10:31:10+01:00 (8 years ago)
- Location:
- branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
r7421 r7430 387 387 surf_tot = glob_sum( surf(:,:) ) ! total ocean surface area 388 388 389 IF( l k_bdy ) CALL ctl_warn( 'dia_hsb_init: heat/salt budget does not consider open boundary fluxes' )389 IF( ln_bdy ) CALL ctl_warn( 'dia_hsb_init: heat/salt budget does not consider open boundary fluxes' ) 390 390 ! 391 391 ! ---------------------------------- ! -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r7421 r7430 875 875 ELSE !* Initialize at "rest" 876 876 ! 877 IF( ln_wd .AND. ( c p_cfg == 'wad' ) ) THEN877 IF( ln_wd .AND. ( cn_cfg == 'wad' ) ) THEN 878 878 ! 879 879 CALL wad_istate ! WAD test configuration : start from -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r7426 r7430 615 615 ! Update only tidal forcing at open boundaries 616 616 #if defined key_tide 617 IF( l k_bdy .AND. lk_tide ) CALL bdy_dta_tides( kt, kit=jn, time_offset= noffset+1 )618 IF( ln_tide_pot .AND. l k_tide ) CALL upd_tide ( kt, kit=jn, time_offset= noffset )617 IF( ln_bdy .AND. ln_tide ) CALL bdy_dta_tides( kt, kit=jn, time_offset= noffset+1 ) 618 IF( ln_tide_pot .AND. ln_tide ) CALL upd_tide ( kt, kit=jn, time_offset= noffset ) 619 619 #endif 620 620 ! … … 868 868 ! 869 869 ! Add tidal astronomical forcing if defined 870 IF ( l k_tide.AND.ln_tide_pot ) THEN870 IF ( ln_tide .AND. ln_tide_pot ) THEN 871 871 DO jj = 2, jpjm1 872 872 DO ji = fs_2, fs_jpim1 ! vector opt. -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90
r7429 r7430 66 66 ione , ionw , iose , iosw , & ! " " 67 67 ibne , ibnw , ibse , ibsw ! " " 68 INTEGER, DIMENSION(jpiglo,jpjglo) :: imask ! global workspace69 REAL(wp), DIMENSION(jpiglo,jpjglo) :: zbot, ztop ! global workspace68 INTEGER, DIMENSION(jpiglo,jpjglo) :: imask ! global workspace 69 REAL(wp), DIMENSION(jpiglo,jpjglo) :: zbot, ztop, zdta ! global workspace 70 70 REAL(wp) :: zidom , zjdom ! local scalars 71 71 NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file, &
Note: See TracChangeset
for help on using the changeset viewer.