Changeset 4781


Ignore:
Timestamp:
2014-09-22T16:54:46+02:00 (6 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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

    r4624 r4781  
    237237         &                ' Inconsistent options') 
    238238 
    239       IF ( ( ln_bkgwri ).AND.( ( ln_asmdin ).OR.( ln_asmiau ) ) )  & 
    240          & CALL ctl_stop( ' ln_bkgwri and either ln_asmdin or ln_asmiau are set to .true.:', & 
    241          &                ' The background state must be written before applying the increments') 
    242  
    243239      IF ( ( niaufn /= 0 ).AND.( niaufn /= 1 ) ) & 
    244240         & CALL ctl_stop( ' niaufn /= 0 or niaufn /=1 :',  & 
  • branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

    r4751 r4781  
    484484      CALL obs_grid_setup( ) 
    485485      IF ( ( n1dint < 0 ).OR.( n1dint > 1 ) ) THEN 
    486          IF(lwp) WRITE(numout,cform_err) 
    487          IF(lwp) WRITE(numout,*) ' Choice of vertical (1D) interpolation method', & 
    488             &                    ' is not available' 
    489          nstop = nstop + 1 
     486         CALL ctl_stop(' Choice of vertical (1D) interpolation method', & 
     487            &                    ' is not available') 
    490488      ENDIF 
    491489      IF ( ( n2dint < 0 ).OR.( n2dint > 4 ) ) THEN 
    492          IF(lwp) WRITE(numout,cform_err) 
    493          IF(lwp) WRITE(numout,*) ' Choice of horizontal (2D) interpolation method', & 
    494             &                    ' is not available' 
    495          nstop = nstop + 1 
     490         CALL ctl_stop(' Choice of horizontal (2D) interpolation method', & 
     491            &                    ' is not available') 
    496492      ENDIF 
    497493 
  • branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/jul2greg.h90

    r2287 r4781  
    1616      !!      ! 06-05  (A. Vidard) Reformatted and refdate       
    1717      !!      ! 06-10  (A. Weaver) Cleanup 
     18      !!      ! 2014-09 (D. Lea) Change to use FLOOR to deal with negative prelday 
    1819      !!----------------------------------------------------------------------- 
    1920 
     
    8283 
    8384      zday = prelday 
    84       ksec = NINT( 86400. * MOD( zday, 1. ) ) 
     85      ksec = FLOOR( 86400. * MOD( zday, 1. ) ) 
    8586 
    8687      IF ( ksec < 0. ) ksec = 86400. + ksec 
  • branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90

    r4752 r4781  
    933933      !!----------------------------------------------------------------------- 
    934934      !! 
    935       !!                     *** ROUTINE obs_wri_seaice  *** 
     935      !!                     *** ROUTINE obs_wri_stats  *** 
    936936      !! 
    937937      !! ** Purpose : Output some basic statistics of the data being written out 
     
    985985         ENDDO 
    986986 
    987 !         IF (lwp) THEN 
    988 !            WRITE(numout,*) 'cname ',fbdata%cname(jvar) 
    989 !      WRITE(numout,*) 'nobs on proc ',fbdata%nobs 
    990 !      WRITE(numout,*) 'nlev on proc ',fbdata%nlev 
    991 !            WRITE(numout,*) 'numgoodobs ', numgoodobs 
    992 !      WRITE(numout,*) 'sum obs - bkg ', zsumx 
    993 !      WRITE(numout,*) 'sum (obs - bkg)^2 ',zsumx2 
    994 !         ENDIF 
    995  
    996 !         CALL obs_mpp_sum_integer( fbdata%nobs, nobsmpp ) 
    997987         CALL obs_mpp_sum_integer( numgoodobs, numgoodobsmpp ) 
    998988         CALL mpp_sum(zsumx) 
     
    1001991         IF (lwp) THEN 
    1002992       WRITE(numout,*) 'Type: ',fbdata%cname(jvar),'  Total number of good observations: ',numgoodobsmpp  
    1003 !      WRITE(numout,*) 'nobs on all ',nobsmpp 
    1004 !      WRITE(numout,*) 'nlev on all ',nlevmpp 
    1005 !            WRITE(numout,*) 'nobs*nlev on all ',nobsmpp*nlev 
    1006 !      WRITE(numout,*) 'sum obs - bkg  all ', zsumx 
    1007 !      WRITE(numout,*) 'sum (obs - bkg)^2 all ',zsumx2 
    1008993       WRITE(numout,*) 'Overall mean obs minus model of the good observations: ',zsumx/numgoodobsmpp 
    1009994            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

    r4753 r4781  
    140140# ORCA2_LIM_OBS:   11 
    141141# ORCA2_AGRIF_LIM: 12 
    142 for config in 1 2 3 4 5 6 7 8 9 10 11 
     142for config in 1 2 3 4 5 6 7 8 9 10 11 12 
    143143 
    144144do 
Note: See TracChangeset for help on using the changeset viewer.