Changeset 296

Timestamp:

2005-09-22T12:56:50+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_009 : CT : remove all 2D array q(:,:) since they are no more used

Location:

trunk/NEMO

Files:

• C1D_SRC/icestp1d.F90 (modified) (2 diffs)
• OPA_SRC/SBC/ocesbc.F90 (modified) (10 diffs)
• OPA_SRC/TRA/traqsr.F90 (modified) (1 diff)

trunk/NEMO/C1D_SRC/icestp1d.F90

@@ -243 +243 @@
          qsr    (:,:) = 0.e0
          qt     (:,:) = 0.e0
-         q      (:,:) = 0.e0
          qrp    (:,:) = 0.e0
          emp    (:,:) = 0.e0
@@ -261 +260 @@
       ! -----------------
       
-      q   (:,:) = fnsolar(:,:) + fsolar(:,:)     ! non solar heat flux + solar flux
-      qt  (:,:) = q(:,:)
+      qt  (:,:) = fnsolar(:,:) + fsolar(:,:)     ! non solar heat flux + solar flux
       qsr (:,:) = fsolar(:,:)                     ! solar flux
       

trunk/NEMO/OPA_SRC/SBC/ocesbc.F90

@@ -41 +41 @@
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &  !:
       qt  ,         &  !: total surface heat flux (w/m2)
-      q   ,         &  !: surface heat flux (w/m2)
       qsr ,         &  !: solar radiation (w/m2)
       emp ,         &  !: evaporation minus precipitation (kg/m2/s = mm/s)
@@ -98 +97 @@
          freeze(:,:) = 0.e0
          qt    (:,:) = 0.e0
-         q     (:,:) = 0.e0
          qrp   (:,:) = 0.e0
          emp   (:,:) = 0.e0
@@ -132 +130 @@
 
          ! non solar heat flux + solar flux + restoring
-         q  (:,:) = fnsolar(:,:) + fsolar(:,:) + qrp(:,:)
-         qt (:,:) = q(:,:)
+         qt (:,:) = fnsolar(:,:) + fsolar(:,:) + qrp(:,:)
 
          ! solar flux
@@ -208 +205 @@
          qsr    (:,:) = 0.e0
          qt     (:,:) = 0.e0
-         q      (:,:) = 0.e0
          qrp    (:,:) = 0.e0
          emp    (:,:) = 0.e0
@@ -228 +224 @@
          ! -----------------
 
-         q   (:,:) = fnsolar(:,:) + fsolar(:,:)     ! non solar heat flux + solar flux
-         qt  (:,:) = q(:,:)
+         qt  (:,:) = fnsolar(:,:) + fsolar(:,:)     ! non solar heat flux + solar flux
          qsr (:,:) = fsolar(:,:)                     ! solar flux
 
@@ -357 +352 @@
             zqi = -3. + zhemis
             qt(ji,jj) = ( (1.-zice) * zq + zice * zqi ) * tmask(ji,jj,1) + qrp(ji,jj)
-            q (ji,jj) = qt(ji,jj)
             
             ! d) water flux damping term erp()
@@ -432 +426 @@
          freeze (:,:) = 0.e0
          qt     (:,:) = 0.e0
-         q      (:,:) = 0.e0
          qrp    (:,:) = 0.e0
          emp    (:,:) = 0.e0
@@ -513 +506 @@
                   * tmask(ji,jj,1)   &
                   + qrp(ji,jj)
-               q  (ji,jj) = qt (ji,jj)
 
             END DO
@@ -574 +566 @@
       !! ** Method  :   Constant surface fluxes (read in namelist (namflx))
       !!
-      !! ** Action  : - q, qt, qsr, emp, emps, qrp, erp
+      !! ** Action  : - qt, qsr, emp, emps, qrp, erp
       !!
       !! History :
@@ -737 +729 @@
             qt    (:,:) = q0
             qsr   (:,:) = qsr0
-            q     (:,:) = q0
             emp   (:,:) = emp0
             emps  (:,:) = emp0

trunk/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -237 +237 @@
          CALL prt_ctl(tab3d_1=ta, clinfo1=' qsr  - Ta: ', mask1=tmask, clinfo3='tra-ta')
       ENDIF
-
-
-      ! 2. Substract qsr from the total heat flux q
-      ! -------------------------------------------
-      DO jj = 2, jpjm1
-         DO ji = fs_2, fs_jpim1   ! vector opt.
-            q(ji,jj) = qt(ji,jj) - qsr(ji,jj)
-         END DO
-      END DO
 
    END SUBROUTINE tra_qsr