Changeset 15225 for NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_surf_def.F90

Timestamp:

2021-09-02T17:52:53+02:00 (3 years ago)

Author:

dford

Message:

Improve handling of velocities, including adding surface currents.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_surf_def.F90 (modified) (7 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_generic_obs/src/OCE/OBS/obs_surf_def.F90

@@ -57 +57 @@
 
       INTEGER, POINTER, DIMENSION(:) :: &
-         & mi,   &        !: i-th grid coord. for interpolating to surface observation
-         & mj,   &        !: j-th grid coord. for interpolating to surface observation
          & mt,   &        !: time record number for gridded data
          & nsidx,&        !: Surface observation number
@@ -70 +68 @@
          & nqc,  &        !: Surface observation qc flag
          & ntyp           !: Type of surface observation product
+
+      INTEGER, POINTER, DIMENSION(:,:) :: &
+         & mi,   &        !: i-th grid coord. for interpolating to surface observation
+         & mj             !: j-th grid coord. for interpolating to surface observation
 
       CHARACTER(len=ilenname), POINTER, DIMENSION(:) :: &
@@ -225 +227 @@
 
       ALLOCATE( &
-         & surf%mi(ksurf),      &
-         & surf%mj(ksurf),      &
          & surf%mt(ksurf),      &
          & surf%nsidx(ksurf),   &
@@ -242 +242 @@
          & surf%rphi(ksurf),    &
          & surf%nsind(ksurf)    &
+         & )
+
+      ALLOCATE( &
+         & surf%mi(ksurf,kvar), &
+         & surf%mj(ksurf,kvar)  &
          & )
 
@@ -474 +479 @@
             insurf = insurf + 1
 
-            newsurf%mi(insurf)    = surf%mi(ji)
-            newsurf%mj(insurf)    = surf%mj(ji)
+            newsurf%mi(insurf,:)  = surf%mi(ji,:)
+            newsurf%mj(insurf,:)  = surf%mj(ji,:)
             newsurf%mt(insurf)    = surf%mt(ji)
             newsurf%nsidx(insurf) = surf%nsidx(ji)
@@ -523 +528 @@
       ! Set book keeping variables which do not depend on number of obs.
 
-      newsurf%nstp     = surf%nstp
-      newsurf%cvars(:) = surf%cvars(:)
-      newsurf%clong(:) = surf%clong(:)
-      newsurf%cunit(:) = surf%cunit(:)
-      newsurf%cgrid(:) = surf%cgrid(:)
-      newsurf%caddvars(:) = surf%caddvars(:)
-      newsurf%caddlong(:) = surf%caddlong(:)
-      newsurf%caddunit(:) = surf%caddunit(:)
-      newsurf%cextvars(:) = surf%cextvars(:)
-      newsurf%cextlong(:) = surf%cextlong(:)
-      newsurf%cextunit(:) = surf%cextunit(:)
+      newsurf%nstp          = surf%nstp
+      newsurf%cvars(:)      = surf%cvars(:)
+      newsurf%clong(:)      = surf%clong(:)
+      newsurf%cunit(:)      = surf%cunit(:)
+      newsurf%cgrid(:)      = surf%cgrid(:)
+      newsurf%caddvars(:)   = surf%caddvars(:)
+      newsurf%caddlong(:,:) = surf%caddlong(:,:)
+      newsurf%caddunit(:,:) = surf%caddunit(:,:)
+      newsurf%cextvars(:)   = surf%cextvars(:)
+      newsurf%cextlong(:)   = surf%cextlong(:)
+      newsurf%cextunit(:)   = surf%cextunit(:)
       
       ! Set gridded stuff
@@ -577 +582 @@
          jj=surf%nsind(ji)
 
-         oldsurf%mi(jj)    = surf%mi(ji)
-         oldsurf%mj(jj)    = surf%mj(ji)
+         oldsurf%mi(jj,:)  = surf%mi(ji,:)
+         oldsurf%mj(jj,:)  = surf%mj(ji,:)
          oldsurf%mt(jj)    = surf%mt(ji)
          oldsurf%nsidx(jj) = surf%nsidx(ji)