Changeset 4522 for palm

Timestamp:

May 6, 2020 2:17:05 PM (4 years ago)

Author:

suehring

Message:

user_init_flight modularized and renamed to user_init_flight_mod

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (4 diffs)
• user_init_flight_mod.f90 (moved) (moved from palm/trunk/SOURCE/user_init_flight.f90) (5 diffs)
• virtual_flight_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# routine user_init_flight renamed to user_init_flight_mod
+# 
+# 4518 2020-05-04 15:44:28Z suehring
 # Remove dependency of read_restart_data_mod on diagnostic_output_quantities_mod
 # 
@@ -306 +309 @@
         user_flight.f90\
         user_init_3d_model.f90 \
-        user_init_flight.f90 \
+        user_init_flight_mod.f90 \
         user_init_grid.f90 \
         user_init_land_surface.f90 \
@@ -1292 +1295 @@
         surface_mod.o \
         user_module.o
-user_init_flight.o: \
+user_init_flight_mod.o: \
         mod_kinds.o \
         modules.o \
@@ -1358 +1361 @@
         restart_data_mpi_io_mod.o \
         user_flight.o \
-        user_init_flight.o
+        user_init_flight_mod.o
 virtual_measurement_mod.o: \
         basic_constants_and_equations_mod.o \

palm/trunk/SOURCE/user_init_flight_mod.f90

@@ -1 @@
-!> @file user_init_flight.f90
+!> @file user_init_flight_mod.f90
 !--------------------------------------------------------------------------------------------------!
 ! This file is part of the PALM model system.
@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! * Modularize user_init_flight in order to provide an explicit interface.
+! * routine renamed to user_init_flight_mod
+! 
+! 4498 2020-04-15 14:26:31Z raasch
 ! file re-formatted to follow the PALM coding standard
 !
@@ -40 +44 @@
 ! Initial revision
 !
+!
 ! Description:
 ! ------------
-!> Execution of user-defined initialization for flight measurements.
+!> Initialization of user-defined flight measurements.
+!>
+!> @todo Integrate into user_module when circular dependencies has been vanished.
 !--------------------------------------------------------------------------------------------------!
- SUBROUTINE user_init_flight( init, k, id, label_leg )
-
+ MODULE user_init_flight_mod
 
     USE control_parameters
@@ -60 +66 @@
 
     IMPLICIT NONE
+
+    PUBLIC user_init_flight
+
+    INTERFACE user_init_flight
+       MODULE PROCEDURE user_init_flight
+    END INTERFACE user_init_flight
+
+    CONTAINS
+
+! Description:
+! ------------
+!> Execution of user-defined initialization for flight measurements.
+!--------------------------------------------------------------------------------------------------!
+ SUBROUTINE user_init_flight( init, k, id, label_leg )
 
     CHARACTER(LEN=10), OPTIONAL ::  label_leg     !< label of the respective leg
@@ -111 +131 @@
 
  END SUBROUTINE user_init_flight
+ 
+ END MODULE user_init_flight_mod
 

palm/trunk/SOURCE/virtual_flight_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularize user_init_flight in order to provide an explicit interface.
+! 
+! 4497 2020-04-15 10:20:51Z raasch
 ! file re-formatted to follow the PALM coding standard
 !
@@ -66 +69 @@
     USE restart_data_mpi_io_mod,                                                                   &
         ONLY:  rd_mpi_io_check_array, rrd_mpi_io_global_array, wrd_mpi_io_global_array
+
+    USE  user_init_flight_mod,                                                                     &
+        ONLY:  user_init_flight