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

palm/trunk/SOURCE/palm.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! - Minor formatting (kanani)
+! - Added Call of date_and_time_init (Russo)
+! - Added Call of calc_date_and_time before call of init_3d where emissions 
+!   are initialized:
+!   we have to know the time indices to initialize emission values (Russo)
+! - Added Call of netcdf_data_input_chemistry_data (Russo)
+!
+! 3274 2018-09-24 15:42:55Z knoop
 ! Modularization of all bulk cloud physics code components
 ! 
@@ -241 +249 @@
     USE arrays_3d
 
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
+
+    USE chem_modules,                                                          &
+        ONLY:  do_emis
+
     USE chemistry_model_mod,                                                   &
-        ONLY:  chem_init
-
-    USE chem_photolysis_mod,                                                   &
-        ONLY:  photolysis_init
+        ONLY:  chem_check_data_output_pr, chem_init
+
+!    USE chem_photolysis_mod,                                                   &
+!        ONLY:  photolysis_init
 
     USE control_parameters,                                                    &
@@ -259 +273 @@
         ONLY:  cpu_log, log_point, log_point_s, cpu_statistics
 
+    USE date_and_time_mod,                                                     &
+        ONLY:  calc_date_and_time, init_date_and_time
+
     USE indices,                                                               &
         ONLY:  nbgp
@@ -264 +281 @@
     USE kinds
 
-    USE bulk_cloud_model_mod,                                                  &
-        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
-
     USE multi_agent_system_mod,                                                &
         ONLY:  agents_active, mas_last_actions
 
     USE netcdf_data_input_mod,                                                 &
-        ONLY:  netcdf_data_input_inquire_file, netcdf_data_input_init,         &
+        ONLY:  chem_emis, chem_emis_att, netcdf_data_input_chemistry_data,     &
+               netcdf_data_input_inquire_file, netcdf_data_input_init,         &
                netcdf_data_input_surface_data, netcdf_data_input_topo
 
@@ -410 +425 @@
 !-- --> Needs to be moved!! What is the dependency about?
 ! IF (  TRIM( initializing_actions ) /= 'read_restart_data' )  THEN
-    IF ( air_chemistry )  THEN
+    IF ( air_chemistry  .AND.  do_emis )  THEN
+
+       IF ( do_emis ) THEN
+          CALL netcdf_data_input_chemistry_data(chem_emis_att,chem_emis)
+       ENDIF
+
        CALL chem_init
-       CALL photolysis_init   ! probably also required for restart
+!       CALL photolysis_init   ! probably also required for restart
+
+       CALL init_date_and_time     !initialize the time of chemistry emissions
+
     ENDIF
 ! END IF
@@ -421 +444 @@
 !
 !-- Initialize all necessary variables
+    CALL calc_date_and_time !this is required for chemistry emissions
+
     CALL init_3d_model