Changeset 3294 for palm/trunk/SOURCE/average_3d_data.f90

Timestamp:

Oct 1, 2018 2:37:10 AM (6 years ago)

Author:

raasch

Message:

modularization of the ocean code

File:

• palm/trunk/SOURCE/average_3d_data.f90 (modified) (7 diffs)

palm/trunk/SOURCE/average_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! changes concerning modularization of ocean option
+! 
+! 3274 2018-09-24 15:42:55Z knoop
 ! Modularization of all bulk cloud physics code components
 ! 
@@ -149 +152 @@
     USE control_parameters,                                                    &
         ONLY:  air_chemistry, average_count_3d, doav, doav_n, land_surface,    &
-               urban_surface, varnamelength
+               ocean_mode, urban_surface, varnamelength
 
     USE cpulog,                                                                &
@@ -165 +168 @@
         ONLY:  lsm_3d_data_averaging
 
+    USE ocean_mod,                                                             &
+        ONLY:  ocean_3d_data_averaging
+
     USE radiation_model_mod,                                                   &
         ONLY:  radiation, radiation_3d_data_averaging
@@ -179 +185 @@
     IMPLICIT NONE
 
-    INTEGER(iwp) ::  i  !< running index
-    INTEGER(iwp) ::  ii !< running index
-    INTEGER(iwp) ::  j  !< running index
-    INTEGER(iwp) ::  k  !< running index
+    INTEGER(iwp) ::  i   !< loop index
+    INTEGER(iwp) ::  ii  !< loop index
+    INTEGER(iwp) ::  j   !< loop index
+    INTEGER(iwp) ::  k   !< loop index
 
     CHARACTER (LEN=varnamelength) ::  trimvar  !< TRIM of output-variable string
@@ -392 +398 @@
              ENDIF
 
-          CASE ( 'rho_ocean' )
-             IF ( ALLOCATED( rho_ocean_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         rho_ocean_av(k,j,i) = rho_ocean_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 's' )
              IF ( ALLOCATED( s_av ) ) THEN
@@ -414 +409 @@
              ENDIF
 
-          CASE ( 'sa' )
-             IF ( ALLOCATED( sa_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         sa_av(k,j,i) = sa_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
          CASE ( 'shf*' )
              IF ( ALLOCATED( shf_av ) ) THEN
@@ -549 +533 @@
              ENDIF
 
+          CASE ( 'usm_output' )
 !             
-!--       Block of urban surface model outputs   
-          CASE ( 'usm_output' )
+!--          Block of urban surface model outputs
              CALL usm_average_3d_data( 'average', doav(ii) )
 
           CASE DEFAULT
 !
-!--          Turbulence closure module
-             CALL tcm_3d_data_averaging( 'average', doav(ii) )
-!
-!--          microphysics module quantities
+!--          Averaging of data from other modules
+             IF ( air_chemistry )  THEN
+                CALL chem_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
+
              IF ( bulk_cloud_model )  THEN
                 CALL bcm_3d_data_averaging( 'average', doav(ii) )
              ENDIF
-!
-!--          Land surface quantity
+
+             IF ( gust_module_enabled )  THEN
+                CALL gust_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
+
              IF ( land_surface )  THEN
                 CALL lsm_3d_data_averaging( 'average', doav(ii) )
              ENDIF
-!
-!--          Radiation quantity
+
+             IF ( ocean_mode )  THEN
+                CALL ocean_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
+
              IF ( radiation )  THEN
                 CALL radiation_3d_data_averaging( 'average', doav(ii) )
              ENDIF
-!
-!--          Gust module quantities
-             IF ( gust_module_enabled )  THEN
-                CALL gust_3d_data_averaging( 'average', doav(ii) )
-             ENDIF
-!
-!--          Chemistry quantity
-             IF ( air_chemistry )  THEN
-                CALL chem_3d_data_averaging( 'average', doav(ii) )
-             ENDIF
-!
-!--          User-defined quantity
+
+             CALL tcm_3d_data_averaging( 'average', doav(ii) )
+!
+!--          User-defined quantities
              CALL user_3d_data_averaging( 'average', doav(ii) )