Changeset 3871 for palm/trunk/SOURCE/salsa_mod.f90

Timestamp:

Apr 8, 2019 2:38:39 PM (6 years ago)

Author:

knoop

Message:

Moving prognostic equations of bcm into bulk_cloud_model_mod

File:

• palm/trunk/SOURCE/salsa_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/salsa_mod.f90

@@ -150 +150 @@
     USE salsa_util_mod
 
+    USE statistics,                                                            &
+        ONLY:  sums_salsa_ws_l
+
     IMPLICIT NONE
 !
@@ -727 +730 @@
        MODULE PROCEDURE salsa_driver
     END INTERFACE salsa_driver
+
+!-- Actions salsa variables
+    INTERFACE salsa_actions
+       MODULE PROCEDURE salsa_actions
+       MODULE PROCEDURE salsa_actions_ij
+    END INTERFACE salsa_actions
 !
 !-- Prognostics equations for salsa variables
@@ -750 +759 @@
            salsa_data_output_mask, salsa_define_netcdf_grid, salsa_diagnostics, salsa_driver,      &
            salsa_emission_update, salsa_header, salsa_init, salsa_init_arrays, salsa_parin,        &
-           salsa_rrd_local, salsa_swap_timelevel, salsa_prognostic_equations, salsa_wrd_local
+           salsa_rrd_local, salsa_swap_timelevel, salsa_prognostic_equations, salsa_wrd_local,     &
+           salsa_actions
 !
 !-- Public parameters, constants and initial values
@@ -1249 +1259 @@
           surf_usm_v(l)%gtsws = 0.0_wp
        ENDDO
+    ENDIF
+
+    IF ( ws_scheme_sca )  THEN
+
+       IF ( salsa )  THEN
+          ALLOCATE( sums_salsa_ws_l(nzb:nzt+1,0:threads_per_task-1) )
+          sums_salsa_ws_l = 0.0_wp
+       ENDIF
+
     ENDIF
 
@@ -7084 +7103 @@
  END SUBROUTINE salsa_diagnostics
 
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Call for all grid points
+!------------------------------------------------------------------------------!
+ SUBROUTINE salsa_actions( location )
+
+
+    CHARACTER (LEN=*), INTENT(IN) ::  location !< call location string
+
+    SELECT CASE ( location )
+
+       CASE ( 'before_timestep' )
+
+          IF ( ws_scheme_sca )  sums_salsa_ws_l = 0.0_wp
+
+       CASE DEFAULT
+          CONTINUE
+
+    END SELECT
+
+ END SUBROUTINE salsa_actions
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Call for grid points i,j
+!------------------------------------------------------------------------------!
+
+ SUBROUTINE salsa_actions_ij( i, j, location )
+
+
+    INTEGER(iwp),      INTENT(IN) ::  i         !< grid index in x-direction
+    INTEGER(iwp),      INTENT(IN) ::  j         !< grid index in y-direction
+    CHARACTER (LEN=*), INTENT(IN) ::  location  !< call location string
+    INTEGER(iwp)  ::  dummy  !< call location string
+
+    IF ( bulk_cloud_model    )   dummy = i + j
+
+    SELECT CASE ( location )
+
+       CASE ( 'before_timestep' )
+
+          IF ( ws_scheme_sca )  sums_salsa_ws_l = 0.0_wp
+
+       CASE DEFAULT
+          CONTINUE
+
+    END SELECT
+
+
+ END SUBROUTINE salsa_actions_ij
+
 !
 !------------------------------------------------------------------------------!
@@ -7095 +7169 @@
     USE control_parameters,                                                                        &
         ONLY:  time_since_reference_point
-
-    USE salsa_util_mod,                                                                            &
-        ONLY:  sums_salsa_ws_l
 
     IMPLICIT NONE
@@ -7167 +7238 @@
     USE control_parameters,                                                                        &
         ONLY:  time_since_reference_point
-
-    USE salsa_util_mod,                                                                            &
-        ONLY:  sums_salsa_ws_l
 
     IMPLICIT NONE