Changeset 7430 for branches/2016

Timestamp:

2016-12-02T10:31:10+01:00 (7 years ago)

Author:

cbricaud

Message:

correct bugs of merge in dev_merge_2016

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diahsb.F90 (modified) (1 diff)
• DOM/domvvl.F90 (modified) (1 diff)
• DYN/dynspg_ts.F90 (modified) (2 diffs)
• LBC/mppini_2.h90 (modified) (1 diff)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -387 +387 @@
       surf_tot  = glob_sum( surf(:,:) )                   ! total ocean surface area
 
-      IF( lk_bdy ) CALL ctl_warn( 'dia_hsb_init: heat/salt budget does not consider open boundary fluxes' )         
+      IF( ln_bdy ) CALL ctl_warn( 'dia_hsb_init: heat/salt budget does not consider open boundary fluxes' )         
       !
       ! ---------------------------------- !

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -875 +875 @@
          ELSE                                   !* Initialize at "rest"
             !
-            IF( ln_wd .AND. ( cp_cfg == 'wad' ) ) THEN
+            IF( ln_wd .AND. ( cn_cfg == 'wad' ) ) THEN
                !
                CALL wad_istate                  ! WAD test configuration : start from 

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -615 +615 @@
          ! Update only tidal forcing at open boundaries
 #if defined key_tide
-         IF( lk_bdy      .AND. lk_tide )   CALL bdy_dta_tides( kt, kit=jn, time_offset= noffset+1 )
-         IF( ln_tide_pot .AND. lk_tide )   CALL upd_tide     ( kt, kit=jn, time_offset= noffset   )
+         IF( ln_bdy      .AND. ln_tide )   CALL bdy_dta_tides( kt, kit=jn, time_offset= noffset+1 )
+         IF( ln_tide_pot .AND. ln_tide )   CALL upd_tide     ( kt, kit=jn, time_offset= noffset   )
 #endif
          !
@@ -868 +868 @@
          !
          ! Add tidal astronomical forcing if defined
-         IF ( lk_tide.AND.ln_tide_pot ) THEN
+         IF ( ln_tide .AND. ln_tide_pot ) THEN
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

@@ -66 +66 @@
          ione  , ionw  , iose  , iosw  ,   &  !    "           "
          ibne  , ibnw  , ibse  , ibsw         !    "           "
-      INTEGER,  DIMENSION(jpiglo,jpjglo) ::   imask        ! global workspace
-      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop   ! global workspace
+      INTEGER,  DIMENSION(jpiglo,jpjglo) ::   imask               ! global workspace
+      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop, zdta    ! global workspace
       REAL(wp) ::   zidom , zjdom          ! local scalars
       NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,         &