Changeset 3298 for palm/trunk/SOURCE/check_parameters.f90

Timestamp:

Oct 2, 2018 12:21:11 PM (6 years ago)

Author:

kanani

Message:

Merge chemistry branch at r3297 to trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• check_parameters.f90 (modified) (5 diffs, 1 prop)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id: check_parameters.f90 2520 2017-10-05 13:50:26Z gronemeier &
+! - Minor formatting and remarks
+! - Call of chem_emissions_check_parameters commented 
+!   (preliminary, as there is still a bug in this subroutine) (forkel)
+! - Corrected call for chemistry profile output added (basit)
+! - Call for init_vertical_profiles for chemistry removed (basit)
+! - Call for chem_init_profiles removed (basit)
+! - Setting of initial profiles for chemstry (constant and call of 
+!   init_vertical_profiles) commented (forkel)
+!
+! 2520 2017-10-05 13:50:26Z gronemeier
 ! changes concerning modularization of ocean option,
 ! init_vertical_profiles moved to separate file to avoid circular dependency
@@ -679 +689 @@
                bcm_check_data_output_pr
 
+    USE chem_emissions_mod,                                                    &
+        ONLY:  chem_emissions_check_parameters
+
+    USE chem_modules
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_boundary_conds, chem_check_data_output,                    &
-               chem_check_data_output_pr, chem_species
-
-    USE chem_modules
+               chem_check_data_output_pr, chem_check_parameters, chem_species
 
     USE control_parameters
@@ -1443 +1456 @@
     ENDIF
 
-!
+!   Check for chem_emission_mod parameters setting
+!   IF ( air_chemistry ) CALL chem_emissions_check_parameters   ! forkel preliminary
+
+
+!   Check for chemitry_model_mod parameters setting
+    IF ( air_chemistry )  CALL chem_check_parameters
+
+
 !-- Check the module settings
     IF ( ocean_mode )  CALL ocean_check_parameters
@@ -1468 +1488 @@
        IF ( humidity       )  q_init  = q_surface
        IF ( passive_scalar )  s_init  = s_surface
-       IF ( air_chemistry )  THEN
-         DO lsp = 1, nvar
-            chem_species(lsp)%conc_pr_init = cs_surface(lsp)      
-         ENDDO
-       ENDIF
+!
+!--    TODO
+!--    Russo: Is done in chem_init and would overwrite what is done there
+!--    --> kanani: Revise
+!      IF ( air_chemistry )  THEN
+!        DO lsp = 1, nvar
+!           chem_species(lsp)%conc_pr_init = cs_surface(lsp)      
+!        ENDDO
+!      ENDIF
 !
 !--
@@ -1683 +1707 @@
        ENDIF
 !
+!--    TODO
 !--    Compute initial chemistry profile using the given chemical species gradients
-       IF ( air_chemistry )  THEN                                                          
-          DO  lsp = 1, nvar
-            CALL init_vertical_profiles( cs_vertical_gradient_level_ind(lsp,:),&
-                                         cs_vertical_gradient_level(lsp,:),    &
-                                         cs_vertical_gradient(lsp,:),          &
-                                         chem_species(lsp)%conc_pr_init,       &
-                                         cs_surface(lsp), bc_cs_t_val(lsp) )
-          ENDDO
-       ENDIF
+!--    Russo: Is done in chem_init --> kanani: Revise
 
     ENDIF