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

Timestamp:

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

Author:

raasch

Message:

modularization of the ocean code

File:

• palm/trunk/SOURCE/netcdf_interface_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/netcdf_interface_mod.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
 ! 
@@ -568 +571 @@
                do3d_time_count, domask_time_count, end_time, land_surface,     &
                mask_size_l, mask_i, mask_i_global, mask_j, mask_j_global,      &
-               mask_k_global, message_string, mid, ntdim_2d_xy,                &
-               ntdim_2d_xz, ntdim_2d_yz, ntdim_3d, nz_do3d, plant_canopy,      &
+               mask_k_global, message_string, mid, ntdim_2d_xy, ntdim_2d_xz,   &
+               ntdim_2d_yz, ntdim_3d, nz_do3d, ocean_mode, plant_canopy,       &
                run_description_header, section, simulated_time,                &
                simulated_time_at_begin, skip_time_data_output_av,              &
@@ -589 +592 @@
     USE land_surface_model_mod,                                                &
         ONLY: lsm_define_netcdf_grid, nzb_soil, nzt_soil, nzs, zs
+
+    USE ocean_mod,                                                             &
+        ONLY:  ocean_define_netcdf_grid
 
     USE pegrid
@@ -943 +949 @@
                 CASE ( 'e', 'lpt', 'nc', 'nr', 'p', 'pc', 'pr', 'prr', 'pt',   &
                        'q', 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv',   &
-                       'rho_ocean', 's', 'sa', 'vpt'  )
+                       's', 'vpt'  )
 
                    grid_x = 'x'
@@ -971 +977 @@
 
 !             
-!--       Block of urban surface model outputs   
+!--             Block of urban surface model outputs
                 CASE ( 'usm_output' )
 
-                   CALL usm_define_netcdf_grid( domask(mid,av,i), found, &
+                   CALL usm_define_netcdf_grid( domask( mid,av,i), found,      &
                                                         grid_x, grid_y, grid_z )
 
                 CASE DEFAULT
-
-                   CALL tcm_define_netcdf_grid( domask(mid,av,i), found, &
-                                                        grid_x, grid_y, grid_z )
-
-!
-!--                Check for land surface quantities
+!
+!--                Check for quantities defined in other modules
+                   IF ( .NOT. found  .AND.  air_chemistry )  THEN
+                      CALL chem_define_netcdf_grid( domask(mid,av,i), found,   &
+                                                    grid_x, grid_y, grid_z )
+                   ENDIF
+
+                   IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
+                      CALL gust_define_netcdf_grid( domask(mid,av,i), found,   &
+                                                    grid_x, grid_y, grid_z )
+                   ENDIF
+
                    IF ( land_surface )  THEN
                       CALL lsm_define_netcdf_grid( domask(mid,av,i), found,    &
                                                    grid_x, grid_y, grid_z )
                    ENDIF
-!
-!--                Check for plant canopy quantities
+
+                   IF ( .NOT. found  .AND.  ocean_mode )  THEN
+                      CALL ocean_define_netcdf_grid( domask(mid,av,i), found,  &
+                                                     grid_x, grid_y, grid_z )
+                   ENDIF
+
                    IF ( .NOT. found  .AND.  plant_canopy )  THEN
                       CALL pcm_define_netcdf_grid( domask(mid,av,i), found,    &
@@ -995 +1011 @@
                    ENDIF
 
-!
-!--                Check for radiation quantities
                    IF ( .NOT. found  .AND.  radiation )  THEN
                       CALL radiation_define_netcdf_grid( domask(mid,av,i),     &
@@ -1003 +1017 @@
                    ENDIF
 
-!
-!--                Check for gust module quantities
-                   IF ( .NOT. found  .AND.  gust_module_enabled )  THEN
-                      CALL gust_define_netcdf_grid( domask(mid,av,i), found,   &
-                                                    grid_x, grid_y, grid_z )
-                   ENDIF
-
-!
-!--                Check for chemistry quantities                   
-                   IF ( .NOT. found  .AND.  air_chemistry )  THEN
-                      CALL chem_define_netcdf_grid( domask(mid,av,i),          &
-                                                    found, grid_x, grid_y,     &
-                                                    grid_z )
-                   ENDIF
-
-!
-!--                Check for user-defined quantities
+                   CALL tcm_define_netcdf_grid( domask( mid,av,i), found,      &
+                                                        grid_x, grid_y, grid_z )
+
+!
+!--                Now check for user-defined quantities
                    IF ( .NOT. found )  THEN
                       CALL user_define_netcdf_grid( domask(mid,av,i), found,   &
@@ -4806 +4808 @@
 !
 !--       Define y-axis
-          CALL netcdf_create_dim(id_set_sp, 'k_y', ny/2, id_dim_y_sp, 282 )
+          CALL netcdf_create_dim( id_set_sp, 'k_y', ny/2, id_dim_y_sp, 282 )
           CALL netcdf_create_var( id_set_sp, (/ id_dim_y_sp /), 'k_y',         &
                                   NF90_DOUBLE, id_var_y_sp, 'm-1', '', 283,    &