Changeset 11224 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE

Timestamp:

2019-07-08T11:19:12+02:00 (5 years ago)

Author:

smasson

Message:

dev_r10984_HPC-13 : bugfix to work will all configurations, see #2285

Location:

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY

Files:

• bdydta.F90 (modified) (1 diff)
• bdydyn2d.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydta.F90

@@ -54 +54 @@
    INTEGER , PARAMETER ::   jp_bdyh_i = 9     ! 
    INTEGER , PARAMETER ::   jp_bdyh_S = 10    ! 
-                                                              ! =F => baroclinic velocities in 3D boundary conditions
+#if ! defined key_si3
+   INTEGER , PARAMETER ::   jpl = 1
+#endif
+                                                             ! =F => baroclinic velocities in 3D boundary conditions
 !$AGRIF_DO_NOT_TREAT
    TYPE(FLD), PUBLIC, ALLOCATABLE, DIMENSION(:,:), TARGET ::   bf   ! structure of input fields (file informations, fields read)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90

@@ -14 +14 @@
    !!   bdy_ssh            : Duplicate sea level across open boundaries
    !!----------------------------------------------------------------------
-   USE oce, only : sshdta => spgu             ! ocean dynamics and tracers 
    USE dom_oce         ! ocean space and time domain
    USE bdy_oce         ! ocean open boundary conditions
@@ -186 +185 @@
       REAL(wp) ::   zfla                             ! Flather correction
       REAL(wp) ::   z1_2                             ! 
+      REAL(wp), DIMENSION(jpi,jpj) ::   sshdta       ! 2D version of dta%ssh
       !!----------------------------------------------------------------------
 
@@ -203 +203 @@
          ii = idx%nbi(jb,igrd)
          ij = idx%nbj(jb,igrd)
-         IF( ll_wd ) THEN
-            sshdta(ii, ij) = dta%ssh(jb)  - ssh_ref 
-         ELSE
-            sshdta(ii, ij) = dta%ssh(jb)
+         IF( ll_wd ) THEN   ;   sshdta(ii, ij) = dta%ssh(jb) - ssh_ref 
+         ELSE               ;   sshdta(ii, ij) = dta%ssh(jb)
          ENDIF
       END DO