Changeset 3585 for branches/2012/dev_r3342_MERCATOR7_SST/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

Timestamp:

2012-11-16T18:14:12+01:00 (11 years ago)

Author:

cbricaud

Message:

commit modifications due to review for SST night operator

File:

• branches/2012/dev_r3342_MERCATOR7_SST/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) (3 diffs)

branches/2012/dev_r3342_MERCATOR7_SST/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

@@ -663 +663 @@
          & psstn,  &    ! Model SST field
          & psstmask     ! Land-sea mask
+      LOGICAL, INTENT(IN) :: ld_nightav
 
       !! * Local declarations
@@ -694 +695 @@
          & igrdi, &
          & igrdj
-      LOGICAL, INTENT(IN) :: ld_nightav
 
       !-----------------------------------------------------------------------
@@ -705 +705 @@
       IF ( ld_nightav ) THEN
 
-      ! Initialize array for night mean
-
-      IF ( kt .EQ. 0 ) THEN
-         ALLOCATE ( icount_sstnight(kpi,kpj) )
-         ALLOCATE ( imask_night(kpi,kpj) )
-         ALLOCATE ( zintmp(kpi,kpj) )
-         ALLOCATE ( zouttmp(kpi,kpj) )
-         ALLOCATE ( zmeanday(kpi,kpj) )
-         nday_qsr = -1   ! initialisation flag for nbc_dcy
-      ENDIF
-
-      ! Initialize daily mean for first timestep
-      idayend = MOD( kt - kit000 + 1, kdaystp )
-
-      ! Added kt == 0 test to catch restart case 
-      IF ( idayend == 1 .OR. kt == 0) THEN
-         IF (lwp) WRITE(numout,*) 'Reset sstdatqc%vdmean on time-step: ',kt
+         ! Initialize array for night mean
+
+         IF ( kt .EQ. 0 ) THEN
+            ALLOCATE ( icount_sstnight(kpi,kpj) )
+            ALLOCATE ( imask_night(kpi,kpj) )
+            ALLOCATE ( zintmp(kpi,kpj) )
+            ALLOCATE ( zouttmp(kpi,kpj) )
+            ALLOCATE ( zmeanday(kpi,kpj) )
+            nday_qsr = -1   ! initialisation flag for nbc_dcy
+         ENDIF
+
+         ! Initialize daily mean for first timestep
+         idayend = MOD( kt - kit000 + 1, kdaystp )
+
+         ! Added kt == 0 test to catch restart case 
+         IF ( idayend == 1 .OR. kt == 0) THEN
+            IF (lwp) WRITE(numout,*) 'Reset sstdatqc%vdmean on time-step: ',kt
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  sstdatqc%vdmean(ji,jj) = 0.0
+                  zmeanday(ji,jj) = 0.0
+                  icount_sstnight(ji,jj) = 0
+               END DO
+            END DO
+         ENDIF
+
+         zintmp(:,:) = 0.0
+         zouttmp(:,:) = sbc_dcy( zintmp(:,:), .TRUE. )
+         imask_night(:,:) = INT( zouttmp(:,:) )
+
          DO jj = 1, jpj
             DO ji = 1, jpi
-               sstdatqc%vdmean(ji,jj) = 0.0
-               zmeanday(ji,jj) = 0.0
-               icount_sstnight(ji,jj) = 0
+               ! Increment the temperature field for computing night mean and counter
+               sstdatqc%vdmean(ji,jj) = sstdatqc%vdmean(ji,jj)  &
+                      &                        + psstn(ji,jj)*imask_night(ji,jj)
+               zmeanday(ji,jj)        = zmeanday(ji,jj) + psstn(ji,jj)
+               icount_sstnight(ji,jj) = icount_sstnight(ji,jj) + imask_night(ji,jj)
             END DO
          END DO
-      ENDIF
-
-      zintmp(:,:) = 0.0
-      zouttmp(:,:) = sbc_dcy( zintmp(:,:), .TRUE. )
-      imask_night(:,:) = INT( zouttmp(:,:) )
-
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            ! Increment the temperature field for computing night mean and counter
-            sstdatqc%vdmean(ji,jj) = sstdatqc%vdmean(ji,jj)  &
-                   &                        + psstn(ji,jj)*imask_night(ji,jj)
-            zmeanday(ji,jj)        = zmeanday(ji,jj) + psstn(ji,jj)
-            icount_sstnight(ji,jj) = icount_sstnight(ji,jj) + imask_night(ji,jj)
-         END DO
-      END DO
    
-      ! Compute the daily mean at the end of day
-
-      zdaystp = 1.0 / REAL( kdaystp )
-
-      IF ( idayend == 0 ) THEN 
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ! Test if "no night" point
-               IF ( icount_sstnight(ji,jj) .NE. 0 ) THEN
-                  sstdatqc%vdmean(ji,jj) = sstdatqc%vdmean(ji,jj) &
+         ! Compute the daily mean at the end of day
+
+         zdaystp = 1.0 / REAL( kdaystp )
+
+         IF ( idayend == 0 ) THEN 
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  ! Test if "no night" point
+                  IF ( icount_sstnight(ji,jj) .NE. 0 ) THEN
+                     sstdatqc%vdmean(ji,jj) = sstdatqc%vdmean(ji,jj) &
                     &                        / icount_sstnight(ji,jj) 
-               ELSE
-                  sstdatqc%vdmean(ji,jj) = zmeanday(ji,jj) * zdaystp
-               ENDIF
+                  ELSE
+                     sstdatqc%vdmean(ji,jj) = zmeanday(ji,jj) * zdaystp
+                  ENDIF
+               END DO
             END DO
-         END DO
-      ENDIF
-
-      ENDIF
+         ENDIF
+
+      ENDIF !ld_nightav
 
       ! Get the data for interpolation