Changeset 3298 for palm/trunk/SOURCE/time_integration.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)
• time_integration.f90 (modified) (8 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Formatting, clean-up, comments (kanani)
+! - Added CALL to chem_emissions_setup (Russo)
+! - Code added for decycling chemistry (basit)
+! 
+! 3294 2018-10-01 02:37:10Z raasch
 ! changes concerning modularization of ocean option
 ! 
@@ -380 +385 @@
         ONLY:  calc_mean_profile
 
+    USE chem_emissions_mod,                                                    &
+        ONLY:  chem_emissions_setup
+
+    USE chem_modules,                                                          &
+        ONLY:  bc_cs_t_val, call_chem_at_all_substeps, cs_name,                &
+               constant_csflux, do_emis, nspec, nspec_out
+
     USE chemistry_model_mod,                                                   &
-        ONLY:  chem_emissions, chem_species
-
-    USE chem_modules,                                                          &
-        ONLY:  nspec 
+        ONLY:  chem_boundary_conds, chem_species
 
     USE control_parameters,                                                    &
@@ -426 +435 @@
         ONLY:  cpu_log, log_point, log_point_s
 
+    USE date_and_time_mod,                                                     &
+        ONLY:  calc_date_and_time, hour_call_emis, hour_of_year
+
     USE flight_mod,                                                            &
         ONLY:  flight_measurement
@@ -450 +462 @@
                lsf_nesting_offline, lsf_nesting_offline_mass_conservation
 
-    USE netcdf_data_input_mod,                                                 &
-        ONLY:  nest_offl, netcdf_data_input_lsf
-
     USE multi_agent_system_mod,                                                &
         ONLY:  agents_active, multi_agent_system
+
+    USE netcdf_data_input_mod,                                                 &
+        ONLY:  chem_emis, chem_emis_att, nest_offl, netcdf_data_input_lsf
 
     USE ocean_mod,                                                             &
@@ -525 +537 @@
     IMPLICIT NONE
 
-    CHARACTER (LEN=9) ::  time_to_string          !< 
-
-    INTEGER(iwp)      ::  n  !< loop counter for chemistry species
+    CHARACTER (LEN=9) ::  time_to_string   !<
+
+    INTEGER(iwp)      ::  lsp       !<
+    INTEGER(iwp)      ::  lsp_usr   !<
+    INTEGER(iwp)      ::  n         !< loop counter for chemistry species
 
     REAL(wp) ::  dt_3d_old  !< temporary storage of timestep to be used for
@@ -611 +625 @@
            bc_pt_t_val = ( pt_init(nzt+1) - pt_init(nzt) ) / dzu(nzt+1)
            bc_q_t_val  = ( q_init(nzt+1) - q_init(nzt) ) / dzu(nzt+1)
+           IF ( air_chemistry )  THEN
+              DO  lsp = 1, nspec
+                 bc_cs_t_val = (  chem_species(lsp)%conc_pr_init(nzt+1)       &
+                                - chem_species(lsp)%conc_pr_init(nzt) )       &
+                               / dzu(nzt+1)
+              ENDDO
+           ENDIF
        ENDIF
 !
@@ -783 +804 @@
           IF ( passive_scalar )  CALL exchange_horiz( s_p, nbgp )
           IF ( air_chemistry )  THEN
-             DO  n = 1, nspec     
-                CALL exchange_horiz( chem_species(n)%conc_p, nbgp ) 
+             DO  lsp = 1, nspec
+                CALL exchange_horiz( chem_species(lsp)%conc_p, nbgp )
+!
+!--             kanani: Push chem_boundary_conds after CALL boundary_conds
+                lsp_usr = 1
+                DO WHILE ( TRIM( cs_name( lsp_usr ) ) /= 'novalue' )
+                   IF ( TRIM(chem_species(lsp)%name) == TRIM(cs_name(lsp_usr)) )  THEN
+                      CALL chem_boundary_conds( chem_species(lsp)%conc_p,              &
+                                                chem_species(lsp)%conc_pr_init )
+                   ENDIF
+                   lsp_usr = lsp_usr + 1
+                ENDDO
              ENDDO
           ENDIF
@@ -1122 +1153 @@
 !
 !--    If required, consider chemical emissions
-!--    (todo (FK): Implement hourly call of emissions, using time_utc from
-!--                data_and_time_mod.f90;
-!--                move the CALL to appropriate location)
-       IF ( air_chemistry ) THEN
-          CALL chem_emissions
+       IF ( air_chemistry  .AND.  do_emis )  THEN
+!
+!--       Update the time --> kanani: revise location of this CALL
+          CALL calc_date_and_time
+!
+!--       Call emission routine only once an hour
+          IF (hour_of_year  .GT.  hour_call_emis )  THEN
+             CALL chem_emissions_setup( chem_emis_att, chem_emis, nspec_out )
+             hour_call_emis = hour_of_year
+          ENDIF
        ENDIF
 !