Changeset 5260 for branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90

Timestamp:

2015-05-12T12:37:15+02:00 (9 years ago)

Author:

deazer

Message:

Merged branch with Trunk at revision 5253.
Checked with SETTE, passes modified iodef.xml for AMM12 experiment

File:

• branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90 (modified) (3 diffs)

branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90

@@ -412 +412 @@
          ENDIF
 
-         IF (MAXVAL(ixpos(ipx1:ipx,ipy1:ipy)) == -1) CYCLE! cycle if no lookup points found
+         IF (.NOT. llfourflag) THEN
+            IF (MAXVAL(ixpos(ipx1:ipx,ipy1:ipy)) == -1) CYCLE! cycle if no lookup points found
+         ENDIF
          
          jimin = 0
@@ -996 +998 @@
                         df = ABS( iypos(ji+1,jj) - iypos(ji,jj) )
                         tmpy1 = df
-                        IF ( df < limxdiff ) numy1 = numy1 + 1
+                        IF ( df < limydiff ) numy1 = numy1 + 1
                         IF ( df < histsize ) histy1(df+1) = histy1(df+1) + 1
                      ENDIF
@@ -1002 +1004 @@
                         df = ABS( iypos(ji,jj+1) - iypos(ji,jj) )
                         tmpy2 = df
-                        IF ( df < limxdiff ) numy2 = numy2+1
+                        IF ( df < limydiff ) numy2 = numy2+1
                         IF ( df < histsize ) histy2(df+1) = histy2(df+1)+1
                      ENDIF