Changeset 3294 for palm/trunk/SOURCE/data_output_2d.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_2d.f90 (modified) (11 diffs)

palm/trunk/SOURCE/data_output_2d.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
 ! 
@@ -238 +241 @@
     USE arrays_3d,                                                             &
         ONLY:  dzw, e, heatflux_output_conversion, nc, nr, p, pt,              &
-               precipitation_amount, prr, q, qc, ql, ql_c, ql_v, qr,           &
-               rho_ocean, s, sa, tend, u, v, vpt, w, zu, zw,                   &
-               waterflux_output_conversion, hyrho, d_exner
+               precipitation_amount, prr, q, qc, ql, ql_c, ql_v, qr, s, tend,  &
+               u, v, vpt, w, zu, zw, waterflux_output_conversion, hyrho, d_exner
 
     USE averaging
@@ -258 +260 @@
                ibc_uv_b, io_blocks, io_group, land_surface, message_string,    &
                ntdim_2d_xy, ntdim_2d_xz, ntdim_2d_yz,                          &
-               psolver, section, simulated_time,                               &
+               ocean_mode, psolver, section, simulated_time,                   &
                time_since_reference_point, uv_exposure
 
@@ -284 +286 @@
                id_var_time_xy, id_var_time_xz, id_var_time_yz, nc_stat,        &
                netcdf_data_format, netcdf_handle_error
+
+    USE ocean_mod,                                                             &
+        ONLY:  ocean_data_output_2d
 
     USE particle_attributes,                                                   &
@@ -940 +945 @@
                 level_z(nzb+1) = zu(nzb+1)
 
-             CASE ( 'rho_ocean_xy', 'rho_ocean_xz', 'rho_ocean_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rho_ocean
-                ELSE
-                   IF ( .NOT. ALLOCATED( rho_ocean_av ) ) THEN
-                      ALLOCATE( rho_ocean_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
-                      rho_ocean_av = REAL( fill_value, KIND = wp )
-                   ENDIF
-                   to_be_resorted => rho_ocean_av
-                ENDIF
-
              CASE ( 's_xy', 's_xz', 's_yz' )
                 IF ( av == 0 )  THEN
@@ -960 +954 @@
                    ENDIF
                    to_be_resorted => s_av
-                ENDIF
-
-             CASE ( 'sa_xy', 'sa_xz', 'sa_yz' )
-                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
 
@@ -1306 +1289 @@
 
 !
-!--             Turbulence closure variables
-                IF ( .NOT. found )  THEN
-                   CALL tcm_data_output_2d( av, do2d(av,if), found, grid, mode,&
-                                             local_pf, nzb_do, nzt_do )
-                ENDIF
-
-!
-!--             Microphysics module quantities
+!--             Quantities of other modules
                 IF ( .NOT. found  .AND.  bulk_cloud_model )  THEN
                    CALL bcm_data_output_2d( av, do2d(av,if), found, grid, mode,&
@@ -1319 +1295 @@
                 ENDIF
 
-!
-!--             Land surface model quantity
+                IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
+                   CALL gust_data_output_2d( av, do2d(av,if), found, grid,     &
+                                             local_pf, two_d, nzb_do, nzt_do )
+                ENDIF
+
                 IF ( .NOT. found  .AND.  land_surface )  THEN
                    CALL lsm_data_output_2d( av, do2d(av,if), found, grid, mode,&
@@ -1326 +1305 @@
                 ENDIF
 
-!
-!--             Radiation quantity
+                IF ( .NOT. found  .AND.  ocean_mode )  THEN
+                   CALL ocean_data_output_2d( av, do2d(av,if), found, grid,    &
+                                              mode, local_pf, nzb_do, nzt_do )
+                ENDIF
+
                 IF ( .NOT. found  .AND.  radiation )  THEN
                    CALL radiation_data_output_2d( av, do2d(av,if), found, grid,&
@@ -1334 +1316 @@
                 ENDIF
 
-!
-!--             Gust module quantities
-                IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
-                   CALL gust_data_output_2d( av, do2d(av,if), found, grid,     &
-                                             local_pf, two_d, nzb_do, nzt_do )
-                ENDIF
-
-!
-!--             UV exposure model quantity
+                IF ( .NOT. found )  THEN
+                   CALL tcm_data_output_2d( av, do2d(av,if), found, grid, mode,&
+                                             local_pf, nzb_do, nzt_do )
+                ENDIF
+
                 IF ( .NOT. found  .AND.  uv_exposure )  THEN
                    CALL uvem_data_output_2d( av, do2d(av,if), found, grid,     &
@@ -1349 +1327 @@
 
 !
-!--             User defined quantity
+!--             User defined quantities
                 IF ( .NOT. found )  THEN
                    CALL user_data_output_2d( av, do2d(av,if), found, grid,     &