Changeset 3877 for palm/trunk

Timestamp:

Apr 8, 2019 7:09:16 PM (6 years ago)

Author:

knoop

Message:

Added chem_actions module interface to chemistry_model_mod and moved photolysis_control call into it

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (1 diff)
• chem_modules.f90 (modified) (1 diff)
• chemistry_model_mod.f90 (modified) (6 diffs)
• module_interface.f90 (modified) (3 diffs)
• prognostic_equations.f90 (modified) (2 diffs)

palm/trunk/SOURCE/Makefile

@@ -866 +866 @@
         chem_gasphase_mod.o \
         chem_modules.o \
+        chem_photolysis_mod.o \
         date_and_time_mod.o \
         diffusion_s.o \

palm/trunk/SOURCE/chem_modules.f90

@@ -80 +80 @@
 !
  MODULE chem_modules
-
-    USE control_parameters,                                                    &
-        ONLY: varnamelength
 
     USE kinds

palm/trunk/SOURCE/chemistry_model_mod.f90

@@ -300 +300 @@
          ONLY:  bc_lr_cyc, bc_ns_cyc, dt_3d, humidity, initializing_actions, message_string,       &
          omega, tsc, intermediate_timestep_count, intermediate_timestep_count_max,                 &
-         max_pr_user, timestep_scheme, use_prescribed_profile_data, ws_scheme_sca         
+         max_pr_user, timestep_scheme, use_prescribed_profile_data, ws_scheme_sca, air_chemistry
 
     USE arrays_3d,                                                                                 &
@@ -310 +310 @@
 
     USE chem_modules
+
+    USE chem_photolysis_mod,                                                                       &
+        ONLY:  photolysis_control
 
     USE statistics
@@ -478 +481 @@
     END INTERFACE chem_parin
 
+    INTERFACE chem_actions
+       MODULE PROCEDURE chem_actions
+       MODULE PROCEDURE chem_actions_ij
+    END INTERFACE chem_actions
+
     INTERFACE chem_prognostic_equations
        MODULE PROCEDURE chem_prognostic_equations
@@ -574 +582 @@
          chem_define_netcdf_grid, chem_header, chem_init, chem_init_arrays,   &
          chem_init_profiles, chem_integrate, chem_parin,                      &
-         chem_prognostic_equations, chem_rrd_local,                           &
+         chem_actions, chem_prognostic_equations, chem_rrd_local,             &
          chem_statistics, chem_swap_timelevel, chem_wrd_local, chem_depo 
 
@@ -1084 +1092 @@
     USE arrays_3d
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, data_output_pr, message_string
+        ONLY:  data_output_pr, message_string
     USE indices
     USE profil_parameter
@@ -2281 +2289 @@
 
  END SUBROUTINE chem_parin
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Call for all grid points
+!------------------------------------------------------------------------------!
+    SUBROUTINE chem_actions( location )
+
+
+    CHARACTER (LEN=*), INTENT(IN) ::  location !< call location string
+
+    SELECT CASE ( location )
+
+       CASE ( 'before_prognostic_equations' )
+!
+!--       Chemical reactions and deposition
+          IF ( chem_gasphase_on ) THEN
+!
+!--          If required, calculate photolysis frequencies -
+!--          UNFINISHED: Why not before the intermediate timestep loop?
+             IF ( intermediate_timestep_count ==  1 )  THEN
+                CALL photolysis_control
+             ENDIF
+
+          ENDIF
+
+       CASE DEFAULT
+          CONTINUE
+
+    END SELECT
+
+    END SUBROUTINE chem_actions
+
+
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Call for grid points i,j
+!------------------------------------------------------------------------------!
+
+    SUBROUTINE chem_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 ( air_chemistry    )   dummy = i + j
+
+    SELECT CASE ( location )
+
+       CASE DEFAULT
+          CONTINUE
+
+    END SELECT
+
+
+    END SUBROUTINE chem_actions_ij
 
  

palm/trunk/SOURCE/module_interface.f90

@@ -166 +166 @@
               chem_init,                                                       &
               chem_header,                                                     &
+              chem_actions,                                                    &
               chem_swap_timelevel,                                             &
               chem_3d_data_averaging,                                          &
@@ -889 +890 @@
 
     IF ( bulk_cloud_model    )  CALL bcm_actions( location )
+    IF ( air_chemistry       )  CALL chem_actions( location )
     IF ( gust_module_enabled )  CALL gust_actions( location )
     IF ( ocean_mode          )  CALL ocean_actions( location )
@@ -913 +915 @@
 
     IF ( bulk_cloud_model    )  CALL bcm_actions( i, j, location )
+    IF ( air_chemistry       )  CALL chem_actions( i, j, location )
     IF ( gust_module_enabled )  CALL gust_actions( i, j, location )
     IF ( ocean_mode          )  CALL ocean_actions( i, j, location )

palm/trunk/SOURCE/prognostic_equations.f90

@@ -394 +394 @@
         ONLY:  nspec, nvar, spc_names
 
-    USE chem_photolysis_mod,                                                   &
-        ONLY:  photolysis_control
-
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_boundary_conds, chem_depo, chem_integrate,                 &
@@ -536 +533 @@
 !-- concentrations of chemical species                                    
     IF ( air_chemistry )  THEN
-       lsp_usr = 1
 !
 !--    Chemical reactions and deposition
        IF ( chem_gasphase_on ) THEN
-!
-!--       If required, calculate photolysis frequencies - 
-!--       UNFINISHED: Why not before the intermediate timestep loop?
-          IF ( intermediate_timestep_count ==  1 )  THEN
-             CALL photolysis_control
-          ENDIF
 
           IF ( intermediate_timestep_count == 1 .OR.                        &