Changeset 2129

Timestamp:

2010-09-29T13:01:23+02:00 (14 years ago)

Author:

rfurner

Message:

pervious merge had mised bits of OBS branch, adding these now

Location:

branches/devukmo2010/NEMO/OPA_SRC

Files:

• SBC/geo2ocean.F90 (modified) (2 diffs)
• opa.F90 (modified) (3 diffs)
• step.F90 (modified) (2 diffs)

branches/devukmo2010/NEMO/OPA_SRC/SBC/geo2ocean.F90

@@ -26 +26 @@
                                              ! repcmo and repere are keep only for compatibility.
                                              ! they are only a useless overlay of rot_rep
+
+   PUBLIC   obs_rot
 
    REAL(wp), DIMENSION(jpi,jpj) ::   &
@@ -522 +524 @@
    END SUBROUTINE repere
 
+
+   SUBROUTINE obs_rot ( psinu, pcosu, psinv, pcosv )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE obs_rot  ***
+      !!
+      !! ** Purpose :   Copy gsinu, gcosu, gsinv and gsinv
+      !!                to input data for rotations of
+      !!                current at observation points
+      !!
+      !! History :
+      !!   9.2  !  09-02  (K. Mogensen)
+      !!----------------------------------------------------------------------
+      REAL(wp), DIMENSION(jpi,jpj), INTENT( OUT )::   &
+         & psinu, pcosu, psinv, pcosv! copy of data
+
+      !!----------------------------------------------------------------------
+
+      ! Initialization of gsin* and gcos* at first call
+      ! -----------------------------------------------
+
+      IF( lmust_init ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) ' obs_rot : geographic <--> stretched'
+         IF(lwp) WRITE(numout,*) ' ~~~~~~~   coordinate transformation'
+
+         CALL angle       ! initialization of the transformation
+         lmust_init = .FALSE.
+
+      ENDIF
+
+      psinu(:,:) = gsinu(:,:)
+      pcosu(:,:) = gcosu(:,:)
+      psinv(:,:) = gsinv(:,:)
+      pcosv(:,:) = gcosv(:,:)
+
+   END SUBROUTINE obs_rot
+
+
   !!======================================================================
 END MODULE geo2ocean

branches/devukmo2010/NEMO/OPA_SRC/opa.F90

@@ -58 +58 @@
    USE sshwzv          ! vertical velocity used in asm
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
+   USE diaobs          ! Observation diagnostics       (dia_obs_init routine)
    USE step            ! OPA time-stepping                  (stp     routine)
 #if defined key_oasis3
@@ -160 +161 @@
          END DO
       ENDIF
+
+      IF( lk_diaobs ) CALL dia_obs_wri
        
       !                            !------------------------!
@@ -294 +297 @@
       !                                     ! diagnostics
       CALL iom_init                             ! iom_put initialization
+
+      IF( lk_diaobs ) THEN
+         CALL dia_obs_init                  ! Initialize observational data
+         CALL dia_obs( nit000 - 1 )         ! Observation operator for restart
+      ENDIF      
+
       CALL dia_ptr_init                         ! Poleward TRansports initialization
       CALL trd_mod_init                         ! Mixed-layer/Vorticity/Integral constraints trends

branches/devukmo2010/NEMO/OPA_SRC/step.F90

@@ -111 +111 @@
    USE diahth          ! thermocline depth                (dia_hth routine)
    USE diafwb          ! freshwater budget                (dia_fwb routine)
+   USE diaobs          ! obs-minus-model (assimilation)   (dia_obs routine)
    USE flo_oce         ! floats variables
    USE floats          ! floats computation               (flo_stp routine)
@@ -250 +251 @@
       IF( lk_diahdy  )   CALL dia_hdy( kstp )         ! dynamical heigh diagnostics
       IF( lk_diafwb  )   CALL dia_fwb( kstp )         ! Fresh water budget diagnostics
+      IF( lk_diaobs  )   CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics
       IF( ln_diaptr  )   CALL dia_ptr( kstp )         ! Poleward TRansports diagnostics
       IF( lk_diaar5  )   CALL dia_ar5( kstp )         ! ar5 diag