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

Timestamp:

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

Author:

raasch

Message:

modularization of the ocean code

File:

• palm/trunk/SOURCE/data_output_3d.f90 (modified) (10 diffs)

palm/trunk/SOURCE/data_output_3d.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
 ! 
@@ -208 +211 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  e, nc, nr, p, pt, prr, q, qc, ql, ql_c, ql_v, qr, rho_ocean, s, &
-               sa, tend, u, v, vpt, w, d_exner
+        ONLY:  d_exner, e, nc, nr, p, pt, prr, q, qc, ql, ql_c, ql_v, qr, s,   &
+               tend, u, v, vpt, w
 
     USE averaging
@@ -225 +228 @@
         ONLY:  air_chemistry, do3d, do3d_no, do3d_time_count,                  &
                io_blocks, io_group, land_surface, message_string,              &
-               ntdim_3d, nz_do3d,  plant_canopy,                               &
+               ntdim_3d, nz_do3d,  ocean_mode, plant_canopy,                   &
                psolver, simulated_time, time_since_reference_point,            &
                urban_surface, varnamelength
@@ -252 +255 @@
                netcdf_data_format, netcdf_handle_error
         
+    USE ocean_mod,                                                             &
+        ONLY:  ocean_data_output_3d
+
     USE particle_attributes,                                                   &
         ONLY:  grid_particles, number_of_particles, particles,                 &
@@ -614 +620 @@
              ENDIF
 
-          CASE ( 'rho_ocean' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rho_ocean
-             ELSE
-                IF ( .NOT. ALLOCATED( rho_ocean_av ) ) THEN
-                   ALLOCATE( u_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   u_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                to_be_resorted => rho_ocean_av
-             ENDIF
-
           CASE ( 's' )
              IF ( av == 0 )  THEN
@@ -634 +629 @@
                 ENDIF
                 to_be_resorted => s_av
-             ENDIF
-
-          CASE ( 'sa' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => sa
-             ELSE
-                IF ( .NOT. ALLOCATED( sa_av ) ) THEN
-                   ALLOCATE( sa_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                   sa_av = REAL( fill_value, KIND = wp )
-                ENDIF
-                to_be_resorted => sa_av
              ENDIF
 
@@ -701 +685 @@
           CASE DEFAULT
 
-             IF ( .NOT. found )  THEN
-                CALL tcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
-                                         nzb_do, nzt_do )
-                resorted = .TRUE.
-             ENDIF
-
-!
-!--          Microphysic module quantities
+!
+!--          Quantities of other modules
              IF ( .NOT. found  .AND.  bulk_cloud_model )  THEN
                 CALL bcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
@@ -715 +693 @@
              ENDIF
 
-!
-!--          Land surface quantity
+             IF ( .NOT. found  .AND.  air_chemistry )  THEN
+                CALL chem_data_output_3d( av, do3d(av,if), found,              &
+                                          local_pf, fill_value, nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
+             IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
+                CALL gust_data_output_3d( av, do3d(av,if), found, local_pf,    &
+                                          nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
              IF ( .NOT. found  .AND.  land_surface )  THEN
 !
@@ -742 +730 @@
              ENDIF
 
-!
-!--          Radiation quantity
+             IF ( .NOT. found  .AND.  ocean_mode )  THEN
+                CALL ocean_data_output_3d( av, do3d(av,if), found, local_pf,   &
+                                           nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
+             IF ( .NOT. found  .AND.  plant_canopy )  THEN
+                CALL pcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
+                                         fill_value, nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
              IF ( .NOT. found  .AND.  radiation )  THEN
                 CALL radiation_data_output_3d( av, do3d(av,if), found,         &
@@ -750 +748 @@
              ENDIF
 
-!
-!--          Gust module quantities
-             IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
-                CALL gust_data_output_3d( av, do3d(av,if), found, local_pf,    &
-                                          nzb_do, nzt_do )
-                resorted = .TRUE.
-             ENDIF
-
-!
-!--          Chemistry model output
-             IF ( .NOT. found  .AND.  air_chemistry )  THEN
-                CALL chem_data_output_3d( av, do3d(av,if), found,              &
-                                          local_pf, fill_value, nzb_do, nzt_do )
-                resorted = .TRUE.
-             ENDIF
-
-!
-!--          Plant canopy model output
-             IF ( .NOT. found  .AND.  plant_canopy )  THEN
-                CALL pcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
-                                         fill_value, nzb_do, nzt_do )
-                resorted = .TRUE.
-             ENDIF
-
-!
-!--          User defined quantity
+             IF ( .NOT. found )  THEN
+                CALL tcm_data_output_3d( av, do3d(av,if), found, local_pf,     &
+                                         nzb_do, nzt_do )
+                resorted = .TRUE.
+             ENDIF
+
+!
+!--          User defined quantities
              IF ( .NOT. found )  THEN
                 CALL user_data_output_3d( av, do3d(av,if), found, local_pf,    &