Changeset 4117 for branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC

Timestamp:

2013-10-23T22:32:11+02:00 (11 years ago)

Author:

andrewryan

Message:

updated naming convention of variables to eliminate confusion with OFF_SRC variables

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC

Files:

• namelist (modified) (1 diff)
• obs_fbm.F90 (modified) (1 diff)
• ooo_data.F90 (modified) (5 diffs)
• ooo_read.F90 (modified) (1 diff)
• ooomod.F90 (modified) (1 diff)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/namelist

@@ -3 +3 @@
 !       namoff Offline obs_oper namelist
 !----------------------------------------------------------------------
-!   off_files     specifies the files containing the model counterpart
-!   nn_off_idx    specifies the index within the model file
-!   nn_off_freq   specifies the number of timesteps between file reads
+!   ooo_files     specifies the files containing the model counterpart
+!   nn_ooo_idx    specifies the index within the model file
+!   nn_ooo_freq   specifies the number of timesteps between file reads
 &namoff
-   off_files = 'fcst.0.nc'
-   nn_off_idx = 1
+   ooo_files = 'fcst.0.nc'
+   nn_ooo_idx = 1
 /
 !----------------------------------------------------------------------

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/obs_fbm.F90

@@ -1564 +1564 @@
       !! ** Purpose : Write an obfbdata structure into a class 4 file.
       !!
-      !! ** Method  : 1. Allocate memory needed by off_wri
+      !! ** Method  : 1. Allocate memory needed by ooo_write
       !!              2. Map obfbdata into allocated memory
-      !!              3. Pass mapped data to off_wri
+      !!              3. Pass mapped data to ooo_write
       !!              4. Deallocate memory
       !!----------------------------------------------------------------------

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/ooo_data.F90

@@ -31 +31 @@
    !! Offline obs_oper settings
    CHARACTER(len=lc) :: &
-      & off_files(MaxNumFiles)         !: model files
+      & ooo_files(MaxNumFiles)         !: model files
    INTEGER            :: &
       & jifile, &                      !: current file list index
       & n_files, &                     !: number of files
       & jimatch, &                     !: current match
-      & nn_off_idx(MaxNumFiles), &     !: time_counter indices
-      & nn_off_freq                    !: read frequency in time steps
+      & nn_ooo_idx(MaxNumFiles), &     !: time_counter indices
+      & nn_ooo_freq                    !: read frequency in time steps
    CHARACTER(len=128) :: &
       & alt_file                       !: altimeter file
@@ -55 +55 @@
 
       ! Standard offline obs_oper information
-      NAMELIST/namoff/off_files, nn_off_idx, nn_off_freq
+      NAMELIST/namoff/ooo_files, nn_ooo_idx, nn_ooo_freq
 
       ! Class 4 file specifiers
@@ -66 +66 @@
       jifile = 1                    !: input file iteration variable 
       n_files = 0                   !: number of files to cycle through
-      off_files(:) = ''             !: list of files to read in
-      nn_off_idx(:) = 0             !: list of indices inside each file
-      nn_off_freq = -1              !: input frequency in time steps
+      ooo_files(:) = ''             !: list of files to read in
+      nn_ooo_idx(:) = 0             !: list of indices inside each file
+      nn_ooo_freq = -1              !: input frequency in time steps
 
       ! Class 4 initialisation
@@ -94 +94 @@
       ! count input files
       lmask(:) = .FALSE.
-      WHERE (off_files(:) /= '') lmask(:) = .TRUE.
+      WHERE (ooo_files(:) /= '') lmask(:) = .TRUE.
       n_files = COUNT(lmask)
 
       !! Initialise sub obs window frequency
-      IF (nn_off_freq == -1) THEN
+      IF (nn_ooo_freq == -1) THEN
          !! Run length
-         nn_off_freq = nitend - nit000 + 1
+         nn_ooo_freq = nitend - nit000 + 1
       ENDIF
 
@@ -111 +111 @@
          DO jf = 1, n_files
             WRITE(numout,'(1X,2A)') '   Input forecast file name          forecastfile = ', &
-               TRIM(off_files(jf))
+               TRIM(ooo_files(jf))
             WRITE(numout,*) '   Input forecast file index        forecastindex = ', &
-               nn_off_idx(jf)
+               nn_ooo_idx(jf)
             WRITE(numout,*) '   Output forecast leadtime index   leadtimeindex = ', &
                cl4_fcst_idx(jf)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/ooo_read.F90

@@ -42 +42 @@
  
       !! Filename, index and match-up kind
-      cdfilename = TRIM(off_files(kfile))
+      cdfilename = TRIM(ooo_files(kfile))
       cmatchname = TRIM(cl4_vars(kfile))
-      kindex = nn_off_idx(kfile)
+      kindex = nn_ooo_idx(kfile)
 
       !! Update model fields

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/ooomod.F90

@@ -75 +75 @@
          DO WHILE ( istp <= nitend .AND. nstop == 0 )
             IF (jifile <= n_files + 1) THEN
-               IF ( MOD(istp, nn_off_freq) == nit000 ) THEN
+               IF ( MOD(istp, nn_ooo_freq) == nit000 ) THEN
                   !! Read next model counterpart
                   CALL ooo_rea_dri(jifile)