Changeset 96 for palm/trunk/SOURCE/sum_up_3d_data.f90

Timestamp:

Jun 4, 2007 8:07:41 AM (14 years ago)

Author:

raasch

Message:

more preliminary uncomplete changes for ocean version

File:

• palm/trunk/SOURCE/sum_up_3d_data.f90 (modified) (5 diffs)

palm/trunk/SOURCE/sum_up_3d_data.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +sum-up of density and salinity
 !
 ! Former revisions:
@@ -132 +132 @@
                 qv_av = 0.0
 
+             CASE ( 'rho' )
+                IF ( .NOT. ALLOCATED( rho_av ) )  THEN
+                   ALLOCATE( rho_av(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
+                ENDIF
+                rho_av = 0.0
+
              CASE ( 's' )
                 IF ( .NOT. ALLOCATED( s_av ) )  THEN
@@ -137 +143 @@
                 ENDIF
                 s_av = 0.0
+
+             CASE ( 'sa' )
+                IF ( .NOT. ALLOCATED( sa_av ) )  THEN
+                   ALLOCATE( sa_av(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
+                ENDIF
+                sa_av = 0.0
 
              CASE ( 't*' )
@@ -337 +349 @@
              ENDDO
 
+          CASE ( 'rho' )
+             DO  i = nxl-1, nxr+1
+                DO  j = nys-1, nyn+1
+                   DO  k = nzb, nzt+1
+                      rho_av(k,j,i) = rho_av(k,j,i) + rho(k,j,i)
+                   ENDDO
+                ENDDO
+             ENDDO
+             
           CASE ( 's' )
              DO  i = nxl-1, nxr+1
@@ -342 +363 @@
                    DO  k = nzb, nzt+1
                       s_av(k,j,i) = s_av(k,j,i) + q(k,j,i)
+                   ENDDO
+                ENDDO
+             ENDDO
+             
+          CASE ( 'sa' )
+             DO  i = nxl-1, nxr+1
+                DO  j = nys-1, nyn+1
+                   DO  k = nzb, nzt+1
+                      sa_av(k,j,i) = sa_av(k,j,i) + sa(k,j,i)
                    ENDDO
                 ENDDO