Changeset 3837 for palm/trunk/SOURCE

Timestamp:

Mar 28, 2019 4:55:58 PM (6 years ago)

Author:

knoop

Message:

Added module_interface for prognostic_equations

Location:

palm/trunk/SOURCE

Files:

• gust_mod.f90 (modified) (3 diffs)
• module_interface.f90 (modified) (4 diffs)
• prognostic_equations.f90 (modified) (3 diffs)

palm/trunk/SOURCE/gust_mod.f90

@@ -85 +85 @@
        gust_header, &
        gust_actions, &
+       gust_prognostic_equations, &
        gust_swap_timelevel, &
        gust_3d_data_averaging, &
@@ -137 +138 @@
     END INTERFACE gust_actions
 
+    INTERFACE gust_prognostic_equations
+       MODULE PROCEDURE gust_prognostic_equations
+       MODULE PROCEDURE gust_prognostic_equations_ij
+    END INTERFACE gust_prognostic_equations
+
     INTERFACE gust_swap_timelevel
        MODULE PROCEDURE gust_swap_timelevel
@@ -380 +386 @@
 
     END SUBROUTINE gust_actions_ij
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Call for all grid points
+!------------------------------------------------------------------------------!
+    SUBROUTINE gust_prognostic_equations()
+
+!
+!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
+       IF ( dummy_logical )  idum = 1
+
+    END SUBROUTINE gust_prognostic_equations
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Call for grid point i,j
+!------------------------------------------------------------------------------!
+    SUBROUTINE gust_prognostic_equations_ij( i, j, i_omp_start, tn )
+
+
+       INTEGER(iwp), INTENT(IN) ::  i            !< grid index in x-direction
+       INTEGER(iwp), INTENT(IN) ::  j            !< grid index in y-direction
+       INTEGER(iwp), INTENT(IN) ::  i_omp_start  !< first loop index of i-loop in prognostic_equations
+       INTEGER(iwp), INTENT(IN) ::  tn           !< task number of openmp task
+
+!
+!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
+       IF ( dummy_logical )  idum = i + j + i_omp_start + tn
+
+    END SUBROUTINE gust_prognostic_equations_ij
 
 

palm/trunk/SOURCE/module_interface.f90

@@ -185 +185 @@
                gust_header,                                                    &
                gust_actions,                                                   &
+               gust_prognostic_equations,                                      &
                gust_swap_timelevel,                                            &
                gust_3d_data_averaging,                                         &
@@ -372 +373 @@
        module_interface_header,                                                &
        module_interface_actions,                                               &
+       module_interface_prognostic_equations,                                  &
        module_interface_swap_timelevel,                                        &
        module_interface_3d_data_averaging,                                     &
@@ -432 +434 @@
        MODULE PROCEDURE module_interface_actions_ij
     END INTERFACE module_interface_actions
+
+    INTERFACE module_interface_prognostic_equations
+       MODULE PROCEDURE module_interface_prognostic_equations
+       MODULE PROCEDURE module_interface_prognostic_equations_ij
+    END INTERFACE module_interface_prognostic_equations
 
     INTERFACE module_interface_swap_timelevel
@@ -894 +901 @@
 ! Description:
 ! ------------
+!> Compute module-specific prognostic_equations (cache-optimized)
+!------------------------------------------------------------------------------!
+ SUBROUTINE module_interface_prognostic_equations()
+
+
+    IF ( gust_module_enabled )  CALL gust_prognostic_equations()
+
+
+ END SUBROUTINE module_interface_prognostic_equations
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Compute module-specific prognostic_equations (vector-optimized)
+!------------------------------------------------------------------------------!
+ SUBROUTINE module_interface_prognostic_equations_ij( i, j, i_omp_start, tn )
+
+
+    INTEGER(iwp), INTENT(IN) ::  i            !< grid index in x-direction
+    INTEGER(iwp), INTENT(IN) ::  j            !< grid index in y-direction
+    INTEGER(iwp), INTENT(IN) ::  i_omp_start  !< first loop index of i-loop in prognostic_equations
+    INTEGER(iwp), INTENT(IN) ::  tn           !< task number of openmp task
+
+
+    IF ( gust_module_enabled )  CALL gust_prognostic_equations( i, j, i_omp_start, tn )
+
+
+ END SUBROUTINE module_interface_prognostic_equations_ij
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
 !> Swap the timelevel pointers for module-specific arrays
 !------------------------------------------------------------------------------!

palm/trunk/SOURCE/prognostic_equations.f90

@@ -432 +432 @@
 
     USE module_interface,                                                      &
-        ONLY:  module_interface_actions
+        ONLY:  module_interface_actions, &
+               module_interface_prognostic_equations
 
     USE ocean_mod,                                                             &
@@ -1420 +1421 @@
 !--       Calculate prognostic equations for turbulence closure
           CALL tcm_prognostic_equations( i, j, i_omp_start, tn )
+!
+!--       Calculate prognostic equations for all other modules
+          CALL module_interface_prognostic_equations( i, j, i_omp_start, tn )
 
 !
@@ -2642 +2646 @@
 !-- Calculate prognostic equations for turbulence closure
     CALL tcm_prognostic_equations()
+!
+!-- Calculate prognostic equations for all other modules
+    CALL module_interface_prognostic_equations()
 
 !