Changeset 3731 for palm/trunk/SOURCE/module_interface.f90

Timestamp:

Feb 11, 2019 1:06:27 PM (6 years ago)

Author:

suehring

Message:

Consider restart data in time-averaged surface output; revise error message; split initialization of surface-output module

File:

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

palm/trunk/SOURCE/module_interface.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Add required restart data for surface output module
 ! 
 ! Former revisions:
@@ -57 +57 @@
 !> This is the interface between the PALM model core and all its modules.
 !>
+!> @todo Re-format module to be consistent with coding standard
 !------------------------------------------------------------------------------!
 MODULE module_interface
@@ -259 +260 @@
    USE surface_data_output_mod,                                                &
        ONLY:  surface_data_output_parin,                                       &
-              surface_data_output_check_parameters
+              surface_data_output_check_parameters,                            &
+              surface_data_output_init_arrays,                                 &
+              surface_data_output_rrd_local,                                   &
+              surface_data_output_rrd_global,                                  &
+              surface_data_output_wrd_local,                                   &
+              surface_data_output_wrd_global
 
    USE synthetic_turbulence_generator_mod,                                     &
@@ -723 +729 @@
    IF ( salsa               )  CALL salsa_init_arrays
    IF ( urban_surface       )  CALL usm_init_arrays
+   IF ( surface_output      )  CALL surface_data_output_init_arrays
    IF ( wind_turbine        )  CALL wtm_init_arrays
 
@@ -1079 +1086 @@
    IF ( .NOT. found )  CALL stg_rrd_global ( found ) ! ToDo: change interface to pass variable
    IF ( .NOT. found )  CALL wtm_rrd_global( found ) ! ToDo: change interface to pass variable
+   IF ( .NOT. found )  CALL surface_data_output_rrd_global( found )
    IF ( .NOT. found )  CALL user_rrd_global( found ) ! ToDo: change interface to pass variable
 
@@ -1100 +1108 @@
    IF ( syn_turb_gen )         CALL stg_wrd_global
    IF ( wind_turbine )         CALL wtm_wrd_global
+   IF ( surface_output )       CALL surface_data_output_wrd_global
    IF ( user_module_enabled )  CALL user_wrd_global
 
@@ -1215 +1224 @@
                               found                                            &
                            ) ! ToDo: change interface to pass variable
-
+          
+   IF ( .NOT. found ) CALL surface_data_output_rrd_local(                      &
+                              file_index, map_index,                           &
+                              nxlf, nxlc, nxl_on_file,                         &
+                              nxrf, nxrc, nxr_on_file,                         &
+                              nynf, nync, nyn_on_file,                         &
+                              nysf, nysc, nys_on_file,                         &
+                              found                                            &
+                           ) ! ToDo: change interface to pass variable
+                           
    IF ( .NOT. found ) CALL user_rrd_local(                                     &
                               file_index, map_index,                           &
@@ -1246 +1264 @@
    IF ( salsa )                CALL salsa_wrd_local
    IF ( urban_surface )        CALL usm_wrd_local
+   IF ( surface_output )       CALL surface_data_output_wrd_local
    IF ( user_module_enabled )  CALL user_wrd_local