Changeset 3874 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Apr 8, 2019 4:53:48 PM (6 years ago)

Author:

knoop

Message:

Implemented non_transport_physics module interfaces

File:

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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added non_transport_physics module interfaces and moved bcm code into it
+! 
+! 3872 2019-04-08 15:03:06Z knoop
 ! Moving prognostic equations of bcm into bulk_cloud_model_mod
 ! 
@@ -378 +381 @@
                ug, u_init, u_p, v, vg, vpt, v_init, v_p, w, w_p
 
-    USE bulk_cloud_model_mod,                                                  &
-        ONLY:  call_microphysics_at_all_substeps, bulk_cloud_model,            &
-               bcm_actions_micro, microphysics_sat_adjust
-
     USE buoyancy_mod,                                                          &
         ONLY:  buoyancy
@@ -441 +440 @@
     USE module_interface,                                                      &
         ONLY:  module_interface_actions, &
+               module_interface_non_transport_physics, &
                module_interface_prognostic_equations
 
@@ -478 +478 @@
         ONLY:  wtm_tendencies
 
+    IMPLICIT NONE
 
     PRIVATE
@@ -510 +511 @@
 
 
-    IMPLICIT NONE
-
     INTEGER(iwp) ::  i                   !<
     INTEGER(iwp) ::  i_omp_start         !<
@@ -649 +648 @@
        ENDIF
 
-    ENDIF 
-
-!
-!-- If required, calculate cloud microphysics
-    IF ( bulk_cloud_model  .AND.  .NOT. microphysics_sat_adjust  .AND.         &
-         ( intermediate_timestep_count == 1  .OR.                              &
-           call_microphysics_at_all_substeps ) )                               &
-    THEN
-       !$OMP PARALLEL PRIVATE (i,j)
-       !$OMP DO
-       DO  i = nxlg, nxrg
-          DO  j = nysg, nyng
-             CALL bcm_actions_micro( i, j )
-           ENDDO
+    ENDIF
+
+    !$OMP PARALLEL PRIVATE (i,j)
+    !$OMP DO
+    DO  i = nxlg, nxrg
+       DO  j = nysg, nyng
+!
+!--       Calculate non transport physics for all other modules
+          CALL module_interface_non_transport_physics( i, j )
        ENDDO
-       !$OMP END PARALLEL
-    ENDIF
+    ENDDO
+    !$OMP END PARALLEL
 
 !
@@ -1238 +1232 @@
 
 
-    IMPLICIT NONE
-
     INTEGER(iwp) ::  i     !<
     INTEGER(iwp) ::  ib    !< index for aerosol size bins (salsa)
@@ -1299 +1291 @@
           ENDIF
        ENDIF
-    ENDIF 
-
-!
-!-- If required, calculate cloud microphysical impacts
-    IF ( bulk_cloud_model  .AND.  .NOT. microphysics_sat_adjust  .AND.         &
-         ( intermediate_timestep_count == 1  .OR.                              &
-           call_microphysics_at_all_substeps )                                 &
-       )  THEN
-       CALL cpu_log( log_point(51), 'microphysics', 'start' )
-       CALL bcm_actions_micro
-       CALL cpu_log( log_point(51), 'microphysics', 'stop' )
     ENDIF
+
+!
+!-- Calculate non transport physics for all other modules
+    CALL module_interface_non_transport_physics
 
 !