Changeset 3924 for palm

Timestamp:

Apr 23, 2019 9:33:06 AM (6 years ago)

Author:

monakurppa

Message:

Bug corrected in salsa_mod, salsa test case introduced and test_salsa input files updated.

Location:

palm/trunk

Files:

• EXAMPLES/test_salsa/LOD2_test_salsa_chemistry (modified) (previous)
• EXAMPLES/test_salsa/LOD2_test_salsa_salsa (modified) (previous)
• EXAMPLES/test_salsa/test_salsa_chemistry (modified) (previous)
• EXAMPLES/test_salsa/test_salsa_salsa (modified) (previous)
• SOURCE/salsa_mod.f90 (modified) (2 diffs)
• TESTS/cases/urban_environment_salsa (added)
• TESTS/cases/urban_environment_salsa/INPUT (added)
• TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_chemistry (added)
• TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_dynamic (added)
• TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_p3d (added)
• TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_salsa (added)
• TESTS/cases/urban_environment_salsa/INPUT/urban_environment_salsa_static (added)
• TESTS/cases/urban_environment_salsa/MONITORING (added)
• TESTS/cases/urban_environment_salsa/MONITORING/urban_environment_salsa_rc (added)
• TESTS/cases/urban_environment_salsa/OUTPUT (added)
• TESTS/cases/urban_environment_salsa/OUTPUT/urban_environment_salsa_3d.nc (added)
• TESTS/cases/urban_environment_salsa/OUTPUT/urban_environment_salsa_ts.nc (added)

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
-! 2018-04-11 monakurppa
+! Correct a bug introduced by the previous update.
+! 
+! 3899 2019-04-16 14:05:27Z monakurppa
 ! - remove unnecessary error / location messages
 ! - corrected some error message numbers
 ! - allocate source arrays only if emissions or dry deposition is applied.
+!
 ! 3885 2019-04-11 11:29:34Z kanani
 ! Changes related to global restructuring of location messages and introduction 
@@ -1457 +1460 @@
 !--    Read in and initialize emissions
        CALL salsa_emission_setup( .TRUE. )
-       IF ( .NOT. salsa_gases_from_chem  .AND.  include_emission )  THEN
+       IF ( .NOT. salsa_gases_from_chem  .AND.  salsa_emission_mode == 'read_from_file' )  THEN
           CALL salsa_gas_emission_setup( .TRUE. )
        ENDIF