Changeset 9523

Timestamp:

2018-04-27T19:39:31+02:00 (6 years ago)

Author:

mathiot

Message:

fix to OBS to deal with a change in the halo at the wrap points (Dan Lea)

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• mpp_map.F90 (modified) (2 diffs)
• obs_grid.F90 (modified) (6 diffs)
• obs_inter_sup.F90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/mpp_map.F90

@@ -12 +12 @@
    USE par_kind, ONLY :   wp            ! Precision variables
    USE par_oce , ONLY :   jpi, jpj      ! Ocean parameters
-   USE dom_oce , ONLY :   mig, mjg, nldi, nlei, nldj, nlej, narea   ! Ocean space and time domain variables
+   USE dom_oce , ONLY :   mig, mjg, nldi, nlei, nldj, nlej, nlci, nlcj, narea   ! Ocean space and time domain variables
 #if defined key_mpp_mpi
    USE lib_mpp, ONLY :   mpi_comm_opa   ! MPP library
@@ -64 +64 @@
       imppmap(:,:) = 0
 
-      ! Setup local grid points
-      imppmap(mig(nldi):mig(nlei),mjg(nldj):mjg(nlej)) = narea 
+!      ! Setup local grid points
+      imppmap(mig(1):mig(nlci),mjg(1):mjg(nlcj)) = narea
       
       ! Get global data

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90

@@ -129 +129 @@
             IF ( cdgrid == 'T' ) THEN
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
-                  &                             nldi, nlei,nldj,  nlej,   &
+                  &                             1, nlci, 1, nlcj,         &
                   &                             nproc, jpnij,             &
                   &                             glamt, gphit, tmask,      &
@@ -136 +136 @@
             ELSEIF ( cdgrid == 'U' ) THEN
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
-                  &                             nldi, nlei,nldj,  nlej,   &
+                  &                             1, nlci, 1, nlcj,         &
                   &                             nproc, jpnij,             &
                   &                             glamu, gphiu, umask,      &
@@ -143 +143 @@
             ELSEIF ( cdgrid == 'V' ) THEN
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
-                  &                             nldi, nlei,nldj,  nlej,   &
+                  &                             1, nlci, 1, nlcj,         &
                   &                             nproc, jpnij,             &
                   &                             glamv, gphiv, vmask,      &
@@ -150 +150 @@
             ELSEIF ( cdgrid == 'F' ) THEN
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
-                  &                             nldi, nlei,nldj,  nlej,   &
+                  &                             1, nlci, 1, nlcj,         &
                   &                             nproc, jpnij,             &
                   &                             glamf, gphif, fmask,      &
@@ -279 +279 @@
          zmskg(:,:) = -1.e+10
          ! Add various grids here.
-         DO jj = nldj, nlej
-            DO ji = nldi, nlei
+         DO jj = 1, nlcj
+            DO ji = 1, nlci
                zlamg(mig(ji),mjg(jj)) = glamt(ji,jj)
                zphig(mig(ji),mjg(jj)) = gphit(ji,jj)
@@ -816 +816 @@
             
             CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo,  &
-               &                     nldi, nlei,nldj,  nlej,    &
+               &                     1, nlci, 1, nlcj,          &
                &                     nproc, jpnij,              &
                &                     glamt, gphit, tmask,       &

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/OBS/obs_inter_sup.F90

@@ -365 +365 @@
          CALL ctl_stop( 'Error in obs_int_comm_3d_local', &
             &           'Point outside local domain' )
-         
+ 
       ENDIF