Changeset 2358 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90

Timestamp:

2010-11-04T19:14:01+01:00 (13 years ago)

Author:

rblod

Message:

Changes to be able to compile v3_3_beta with key_agrif,see ticket #753 ; just compilation fixes, I was to scared to try to run AGRIF

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) (15 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90

@@ -44 +44 @@
    PRIVATE linquad,                    & ! Determine whether a point lies within a cell
       &    maxdist,                    & ! Find the maximum distance between 2 pts in a cell
-      &    obs_grid_search_bruteforce, & ! Find i, j on the ORCA grid from lat, lon
-      &    obs_grid_search_lookup        ! Find i, j on the ORCA grid from lat, lon quicker
+      &    obs_grd_bruteforce, & ! Find i, j on the ORCA grid from lat, lon
+      &    obs_grd_lookup        ! Find i, j on the ORCA grid from lat, lon quicker
 
    !!* Module variables
@@ -75 +75 @@
       & ixpos, &
       & iypos, &
-      & iproc    
+      & iprocn    
 
    ! Switches
@@ -98 +98 @@
       !! ** Purpose : Search local gridpoints to find the grid box containing
       !!              the observations calls either
-      !!              obs_grid_search_bruteforce - the original brute force search
+      !!              obs_grd_bruteforce - the original brute force search
       !!                     or
-      !!              obs_grid_search_lookup - uses a lookup table to do a fast 
+      !!              obs_grd_lookup - uses a lookup table to do a fast 
       !!search
       !!History :
@@ -122 +122 @@
 
          IF ( ln_grid_search_lookup .AND. ( cdgrid == 'T' ) ) THEN
-            CALL obs_grid_search_lookup( kobsin, plam, pphi, &
+            CALL obs_grd_lookup( kobsin, plam, pphi, &
                &                         kobsi, kobsj, kproc )
          ELSE
             IF ( cdgrid == 'T' ) THEN
-               CALL obs_grid_search_bruteforce( jpi, jpj, jpiglo, jpjglo, &
+               CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             nldi, nlei,nldj,  nlej,   &
                   &                             nproc, jpnij,             &
@@ -133 +133 @@
                   &                             kobsi, kobsj, kproc )
             ELSEIF ( cdgrid == 'U' ) THEN
-               CALL obs_grid_search_bruteforce( jpi, jpj, jpiglo, jpjglo, &
+               CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             nldi, nlei,nldj,  nlej,   &
                   &                             nproc, jpnij,             &
@@ -140 +140 @@
                   &                             kobsi, kobsj, kproc )
             ELSEIF ( cdgrid == 'V' ) THEN
-               CALL obs_grid_search_bruteforce( jpi, jpj, jpiglo, jpjglo, &
+               CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             nldi, nlei,nldj,  nlej,   &
                   &                             nproc, jpnij,             &
@@ -147 +147 @@
                   &                             kobsi, kobsj, kproc )
             ELSEIF ( cdgrid == 'F' ) THEN
-               CALL obs_grid_search_bruteforce( jpi, jpj, jpiglo, jpjglo, &
+               CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             nldi, nlei,nldj,  nlej,   &
                   &                             nproc, jpnij,             &
@@ -162 +162 @@
    END SUBROUTINE obs_grid_search
 
-#include "obs_grid_search_bruteforce.h90"
+#include "obs_grd_bruteforce.h90"
    
-   SUBROUTINE obs_grid_search_lookup( kobs, plam, pphi, kobsi, kobsj, kproc )
+   SUBROUTINE obs_grd_lookup( kobs, plam, pphi, kobsi, kobsj, kproc )
       !!----------------------------------------------------------------------
-      !!                ***  ROUTINE obs_grid_search_lookup ***
+      !!                ***  ROUTINE obs_grid_lookup ***
       !!
       !! ** Purpose : Search local gridpoints to find the grid box containing
-      !!              the observations (much faster then obs_grid_search_bruteforce)
+      !!              the observations (much faster then obs_grd_bruteforce)
       !!
       !! ** Method  : Call to linquad
@@ -361 +361 @@
       END DO
 
-      if(lwp) WRITE(numout,*) 'obs_grid_search_lookup do coordinate search using lookup table'
+      if(lwp) WRITE(numout,*) 'obs_grid_lookup do coordinate search using lookup table'
 
       !-----------------------------------------------------------------------
@@ -630 +630 @@
          & )
       
-   END SUBROUTINE obs_grid_search_lookup
+   END SUBROUTINE obs_grd_lookup
 
 
@@ -758 +758 @@
                & ixpos(nlons,nlats), &
                & iypos(nlons,nlats), &
-               & iproc(nlons,nlats)  &
+               & iprocn(nlons,nlats)  &
                & )
             
@@ -818 +818 @@
             END DO
             
-            CALL obs_grid_search_bruteforce( jpi, jpj, jpiglo, jpjglo,  &
-               &                             nldi, nlei,nldj,  nlej,    &
-               &                             nproc, jpnij,              &
-               &                             glamt, gphit, tmask,       &
-               &                             nlons*nlats, lonsi, latsi, &
-               &                             ixposi, iyposi, iproci )
+            CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo,  &
+               &                     nldi, nlei,nldj,  nlej,    &
+               &                     nproc, jpnij,              &
+               &                     glamt, gphit, tmask,       &
+               &                     nlons*nlats, lonsi, latsi, &
+               &                     ixposi, iyposi, iproci )
             
             ! minimise file size by removing regions with no data from xypos file
@@ -873 +873 @@
                & ixpos(nlons,nlats),   &
                & iypos(nlons,nlats),   &
-               & iproc(nlons,nlats)    &
+               & iprocn(nlons,nlats)    &
                & )
 
@@ -880 +880 @@
             ixpos(:,:) = ixposi(jimin:jimax,jjmin:jjmax)
             iypos(:,:) = iyposi(jimin:jimax,jjmin:jjmax)
-            iproc(:,:) = iproci(jimin:jimax,jjmin:jjmax)
+            iprocn(:,:) = iproci(jimin:jimax,jjmin:jjmax)
 
             DEALLOCATE(lonsi,latsi,ixposi,iyposi,iproci)
@@ -1169 +1169 @@
 
       IF (ln_grid_search_lookup) THEN
-         DEALLOCATE( lons, lats, ixpos, iypos, iproc )
+         DEALLOCATE( lons, lats, ixpos, iypos, iprocn )
       ENDIF