Changeset 4120

Timestamp:

2013-10-24T10:29:13+02:00 (11 years ago)

Author:

andrewryan

Message:

Refactored offline_obs_oper to be nemo_gcm. Renamed ooomod.F90 to ooo_intp.F90 since it now contains the interpolation steps only. Renamed namelist to ooo.nml since it contains settings for the offline obs_oper only.

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC

Files:

• nemo.f90 (deleted)
• nemogcm.F90 (modified) (2 diffs)
• ooo.nml (moved) (moved from branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/namelist)
• ooo_intp.F90 (moved) (moved from branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/NEMO/OOO_SRC/ooomod.F90) (2 diffs)

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

@@ -63 +63 @@
    USE xios
 #endif
+   USE ooo_data        ! Offline obs_oper data
+   USE ooo_read        ! Offline obs_oper read routines
+   USE ooo_intp        ! Offline obs_oper interpolation
 
    IMPLICIT NONE
    PRIVATE
 
+   PUBLIC   nemo_gcm    ! called by nemo.f90
    PUBLIC   nemo_init   ! needed by AGRIF
    PUBLIC   nemo_alloc  ! needed by TAM
@@ -79 +83 @@
 CONTAINS
 
+   SUBROUTINE nemo_gcm
+         !!----------------------------------------------------------------------
+         !!                    ***  SUBROUTINE offline_obs_oper ***
+         !!
+         !! ** Purpose : To use NEMO components to interpolate model fields
+         !!              to observation space.
+         !!
+         !! ** Method : 1. Initialise NEMO
+         !!             2. Initialise offline obs_oper
+         !!             3. Cycle through match ups
+         !!             4. Write results to file
+         !!
+         !!----------------------------------------------------------------------
+         !! Class 4 output stream switch
+         USE obs_fbm, ONLY: ln_cl4
+         !! Initialise NEMO
+         CALL nemo_init
+         !! Initialise Offline obs_oper data
+         CALL ooo_data_init( ln_cl4 )
+         !! Loop over various model counterparts
+         DO jimatch = 1, cl4_match_len
+            IF (jimatch .GT. 1) THEN
+               !! Initialise obs_oper
+               CALL dia_obs_init
+            END IF
+            !! Interpolate to observation space
+            CALL ooo_interp
+            !! Pipe to output files
+            CALL dia_obs_wri
+            !! Reset the obs_oper between
+            CALL dia_obs_dealloc
+         END DO
+         !! Safely stop MPI
+         IF(lk_mpp) CALL mppstop  ! end mpp communications
+   END SUBROUTINE nemo_gcm
 
    SUBROUTINE nemo_init

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

@@ -1 @@
-MODULE ooomod
+MODULE ooo_intp
    !!======================================================================
-   !!                    ***  MODULE ooo ***
+   !!                    ***  MODULE ooo_intp ***
    !! ** Purpose : Run NEMO observation operator in offline mode
    !!======================================================================
    !! NEMO modules
+   USE in_out_manager
    USE diaobs
-   USE nemogcm
-   USE lib_mpp
-   USE in_out_manager
-   USE obs_fbm, ONLY: ln_cl4
    !! Offline obs_oper modules
+   USE ooo_read
    USE ooo_data
-   USE ooo_read
 
    IMPLICIT NONE
    PRIVATE
 
-   PUBLIC offline_obs_oper
+   PUBLIC ooo_interp
 
    CONTAINS
-
-      SUBROUTINE offline_obs_oper
-         !!----------------------------------------------------------------------
-         !!                    ***  SUBROUTINE offline_obs_oper ***
-         !!
-         !! ** Purpose : To use NEMO components to interpolate model fields
-         !!              to observation space.
-         !!
-         !!----------------------------------------------------------------------
-         !! Initialise NEMO
-         CALL nemo_init
-         !! Initialise Offline obs_oper data
-         CALL ooo_data_init( ln_cl4 )
-         !! Loop over various model counterparts
-         DO jimatch = 1, cl4_match_len
-            IF (jimatch .GT. 1) THEN
-               !! Initialise obs_oper
-               CALL dia_obs_init
-            END IF
-            !! Interpolate to observation space
-            CALL ooo_interp
-            !! Pipe to output files
-            CALL dia_obs_wri
-            !! Reset the obs_oper between
-            CALL dia_obs_dealloc
-         END DO
-         !! Safely stop MPI
-         IF(lk_mpp) CALL mppstop  ! end mpp communications
-      END SUBROUTINE offline_obs_oper
 
       SUBROUTINE ooo_interp
@@ -78 +46 @@
       END SUBROUTINE ooo_interp
 
-END MODULE ooomod
+END MODULE ooo_intp