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

Timestamp:

Jan 26, 2019 6:57:21 PM (6 years ago)

Author:

knoop

Message:

Added module switch for user_module.
User module is enabled as soon as the user_parameters namelist is found.

File:

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

palm/trunk/SOURCE/netcdf_interface_mod.f90

@@ -673 +673 @@
         ONLY: lsm_define_netcdf_grid, nzb_soil, nzt_soil, nzs, zs
 
-    USE user,                                                                  &
-        ONLY:  user_define_netcdf_grid
-
     USE ocean_mod,                                                             &
         ONLY:  ocean_define_netcdf_grid
@@ -707 +704 @@
     USE urban_surface_mod,                                                     &
         ONLY:  usm_define_netcdf_grid
+
+    USE user,                                                                  &
+        ONLY:  user_module_enabled, user_define_netcdf_grid
 
 
@@ -1160 +1160 @@
 !
 !--                Now check for user-defined quantities
-                   IF ( .NOT. found )  THEN
+                   IF ( .NOT. found  .AND.  user_module_enabled )  THEN
                       CALL user_define_netcdf_grid( domask(mid,av,i), found,   &
                                                     grid_x, grid_y, grid_z )
@@ -1922 +1922 @@
 !                   
 !--                Check for user-defined quantities
-                   IF ( .NOT. found )  THEN
+                   IF ( .NOT. found  .AND.  user_module_enabled )  THEN
                       CALL user_define_netcdf_grid( do3d(av,i), found, grid_x, &
                                                     grid_y, grid_z )
@@ -2900 +2900 @@
 !
 !--                      Check for user-defined quantities
-                         IF ( .NOT. found )  THEN
+                         IF ( .NOT. found  .AND.  user_module_enabled )  THEN
                             CALL user_define_netcdf_grid( do2d(av,i), found,   &
                                                           grid_x, grid_y,      &
@@ -3792 +3792 @@
 !
 !--                   Check for user-defined quantities
-                      IF ( .NOT. found )  THEN
+                      IF ( .NOT. found  .AND.  user_module_enabled )  THEN
                          CALL user_define_netcdf_grid( do2d(av,i), found,      &
                                                        grid_x, grid_y, grid_z )
@@ -4649 +4649 @@
 !
 !--                   Check for user-defined quantities
-                      IF ( .NOT. found )  THEN
+                      IF ( .NOT. found  .AND.  user_module_enabled )  THEN
                          CALL user_define_netcdf_grid( do2d(av,i), found,      &
                                                        grid_x, grid_y, grid_z )
@@ -5965 +5965 @@
 !--                Check for user-defined quantities (found, grid_x and grid_y
 !--                are dummies)
-                   CALL user_define_netcdf_grid( data_output_sp(i), found,     &
-                                                 grid_x, grid_y, grid_z )
+                   IF ( user_module_enabled )  THEN
+                      CALL user_define_netcdf_grid( data_output_sp(i), found,  &
+                                                    grid_x, grid_y, grid_z )
+                   ENDIF
 
              END SELECT