Changeset 6032

Timestamp:

2015-12-11T09:24:14+01:00 (9 years ago)

Author:

timgraham

Message:

Remove insitu temperature for now to be replaced with a versios consistent with EOS later

Location:

branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• dia25h.F90 (modified) (8 diffs)
• diainsitutem.F90 (deleted)

branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

@@ -8 +8 @@
    USE oce             ! ocean dynamics and tracers variables
    USE dom_oce         ! ocean space and time domain
-   USE diainsitutem, ONLY: rinsitu_t, theta2t
    USE in_out_manager  ! I/O units
    USE iom             ! I/0 library
@@ -29 +28 @@
 
   !! * variables for calculating 25-hourly means
-   REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:) ::   tn_25h  , sn_25h, rinsitu_t_25h  
+   REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:) ::   tn_25h  , sn_25h
    REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:)   ::   sshn_25h 
    REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:) ::   un_25h  , vn_25h  , wn_25h
@@ -95 +94 @@
          CALL ctl_stop( 'dia_25h: unable to allocate sn_25h' )   ;   RETURN
       ENDIF
-      ALLOCATE( rinsitu_t_25h(jpi,jpj,jpk), STAT=ierror )
-      IF( ierror > 0 ) THEN
-         CALL ctl_stop( 'dia_25h: unable to allocate rinsitu_t_25h' )   ;   RETURN
-      ENDIF
       ALLOCATE( un_25h(jpi,jpj,jpk), STAT=ierror )
       IF( ierror > 0 ) THEN
@@ -142 +137 @@
       sn_25h(:,:,:) = tsb(:,:,:,jp_sal)
       CALL theta2t
-      rinsitu_t_25h(:,:,:) = rinsitu_t(:,:,:)
       sshn_25h(:,:) = sshb(:,:)
       un_25h(:,:,:) = ub(:,:,:)
@@ -235 +229 @@
          tn_25h(:,:,:)        = tn_25h(:,:,:) + tsn(:,:,:,jp_tem)
          sn_25h(:,:,:)        = sn_25h(:,:,:) + tsn(:,:,:,jp_sal)
-         CALL theta2t
-         rinsitu_t_25h(:,:,:)  = rinsitu_t_25h(:,:,:) + rinsitu_t(:,:,:)
          sshn_25h(:,:)        = sshn_25h(:,:) + sshn (:,:)
          un_25h(:,:,:)        = un_25h(:,:,:) + un(:,:,:)
@@ -267 +259 @@
             tn_25h(:,:,:)        = tn_25h(:,:,:) / 25.0_wp
             sn_25h(:,:,:)        = sn_25h(:,:,:) / 25.0_wp
-            rinsitu_t_25h(:,:,:)  = rinsitu_t_25h(:,:,:) / 25.0_wp
             sshn_25h(:,:)        = sshn_25h(:,:) / 25.0_wp
             un_25h(:,:,:)        = un_25h(:,:,:) / 25.0_wp
@@ -286 +277 @@
             zw3d(:,:,:) = tn_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
             CALL iom_put("temper25h", zw3d)   ! potential temperature
-            CALL theta2t                                                                    ! calculate insitu temp
-            zw3d(:,:,:) = rinsitu_t_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
-            CALL iom_put("tempis25h", zw3d)   ! in-situ temperature
             zw3d(:,:,:) = sn_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
             CALL iom_put( "salin25h", zw3d  )   ! salinity
@@ -319 +307 @@
             tn_25h(:,:,:) = tsn(:,:,:,jp_tem)
             sn_25h(:,:,:) = tsn(:,:,:,jp_sal)
-            CALL theta2t
-            rinsitu_t_25h(:,:,:) = rinsitu_t(:,:,:)
             sshn_25h(:,:) = sshn (:,:)
             un_25h(:,:,:) = un(:,:,:)