Changeset 4781

Timestamp:

2014-09-22T16:54:46+02:00 (10 years ago)

Author:

djlea

Message:

Remove redundant error check preventing background write and increments being applied in the same run. Switch to use ctl_stop in diaobs. Fix to jul2greg to deal properly with negative julian dates. Tidying obs_write. Restore agrif sette test.

Location:

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM

Files:

• NEMO/OPA_SRC/ASM/asminc.F90 (modified) (1 diff)
• NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (1 diff)
• NEMO/OPA_SRC/OBS/jul2greg.h90 (modified) (2 diffs)
• NEMO/OPA_SRC/OBS/obs_write.F90 (modified) (3 diffs)
• SETTE/sette.sh (modified) (1 diff)

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -237 +237 @@
          &                ' Inconsistent options')
 
-      IF ( ( ln_bkgwri ).AND.( ( ln_asmdin ).OR.( ln_asmiau ) ) )  &
-         & CALL ctl_stop( ' ln_bkgwri and either ln_asmdin or ln_asmiau are set to .true.:', &
-         &                ' The background state must be written before applying the increments')
-
       IF ( ( niaufn /= 0 ).AND.( niaufn /= 1 ) ) &
          & CALL ctl_stop( ' niaufn /= 0 or niaufn /=1 :',  &

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -484 +484 @@
       CALL obs_grid_setup( )
       IF ( ( n1dint < 0 ).OR.( n1dint > 1 ) ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' Choice of vertical (1D) interpolation method', &
-            &                    ' is not available'
-         nstop = nstop + 1
+         CALL ctl_stop(' Choice of vertical (1D) interpolation method', &
+            &                    ' is not available')
       ENDIF
       IF ( ( n2dint < 0 ).OR.( n2dint > 4 ) ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' Choice of horizontal (2D) interpolation method', &
-            &                    ' is not available'
-         nstop = nstop + 1
+         CALL ctl_stop(' Choice of horizontal (2D) interpolation method', &
+            &                    ' is not available')
       ENDIF
 

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90

@@ -16 +16 @@
       !!      ! 06-05  (A. Vidard) Reformatted and refdate      
       !!      ! 06-10  (A. Weaver) Cleanup
+      !!      ! 2014-09 (D. Lea) Change to use FLOOR to deal with negative prelday
       !!-----------------------------------------------------------------------
 
@@ -82 +83 @@
 
       zday = prelday
-      ksec = NINT( 86400. * MOD( zday, 1. ) )
+      ksec = FLOOR( 86400. * MOD( zday, 1. ) )
 
       IF ( ksec < 0. ) ksec = 86400. + ksec

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90

@@ -933 +933 @@
       !!-----------------------------------------------------------------------
       !!
-      !!                     *** ROUTINE obs_wri_seaice  ***
+      !!                     *** ROUTINE obs_wri_stats  ***
       !!
       !! ** Purpose : Output some basic statistics of the data being written out
@@ -985 +985 @@
          ENDDO
 
-!         IF (lwp) THEN
-!            WRITE(numout,*) 'cname ',fbdata%cname(jvar)
-!      WRITE(numout,*) 'nobs on proc ',fbdata%nobs
-!      WRITE(numout,*) 'nlev on proc ',fbdata%nlev
-!            WRITE(numout,*) 'numgoodobs ', numgoodobs
-!      WRITE(numout,*) 'sum obs - bkg ', zsumx
-!      WRITE(numout,*) 'sum (obs - bkg)^2 ',zsumx2
-!         ENDIF
-
-!         CALL obs_mpp_sum_integer( fbdata%nobs, nobsmpp )
          CALL obs_mpp_sum_integer( numgoodobs, numgoodobsmpp )
          CALL mpp_sum(zsumx)
@@ -1001 +991 @@
          IF (lwp) THEN
        WRITE(numout,*) 'Type: ',fbdata%cname(jvar),'  Total number of good observations: ',numgoodobsmpp 
-!      WRITE(numout,*) 'nobs on all ',nobsmpp
-!      WRITE(numout,*) 'nlev on all ',nlevmpp
-!            WRITE(numout,*) 'nobs*nlev on all ',nobsmpp*nlev
-!      WRITE(numout,*) 'sum obs - bkg  all ', zsumx
-!      WRITE(numout,*) 'sum (obs - bkg)^2 all ',zsumx2
        WRITE(numout,*) 'Overall mean obs minus model of the good observations: ',zsumx/numgoodobsmpp
             WRITE(numout,*) 'Overall RMS obs minus model of the good observations: ',sqrt( zsumx2/numgoodobsmpp )

branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/SETTE/sette.sh

@@ -140 +140 @@
 # ORCA2_LIM_OBS:   11
 # ORCA2_AGRIF_LIM: 12
-for config in 1 2 3 4 5 6 7 8 9 10 11
+for config in 1 2 3 4 5 6 7 8 9 10 11 12
 
 do