Changeset 4255 for palm/trunk

Timestamp:

Oct 4, 2019 11:50:55 AM (5 years ago)

Author:

monakurppa

Message:

Bug corrected in salsa_mod in writing the run control

Location:

palm/trunk

Files:

• SOURCE/salsa_mod.f90 (modified) (3 diffs)
• TESTS/cases/urban_environment_salsa/MONITORING/urban_environment_salsa_rc (modified) (2 diffs)

palm/trunk/SOURCE/salsa_mod.f90

@@ -1093 +1093 @@
     WRITE( io, 4 )  nz, ny, nx, nbins_aerosol
     IF ( advect_particle_water )  THEN
-       WRITE( io, 5 )  SHAPE( aerosol_mass(1)%conc ), ncomponents_mass*nbins_aerosol,              &
-                        advect_particle_water
+       WRITE( io, 5 )  nz, ny, nx, ncomponents_mass*nbins_aerosol, advect_particle_water
     ELSE
-       WRITE( io, 5 )  SHAPE( aerosol_mass(1)%conc ), ncc*nbins_aerosol, advect_particle_water
+       WRITE( io, 5 )  nz, ny, nx, ncc*nbins_aerosol, advect_particle_water
     ENDIF
     IF ( .NOT. salsa_gases_from_chem )  THEN
-       WRITE( io, 6 )  SHAPE( aerosol_mass(1)%conc ), ngases_salsa, salsa_gases_from_chem
+       WRITE( io, 6 )  nz, ny, nx, ngases_salsa, salsa_gases_from_chem
     ENDIF
     WRITE( io, 7 )
@@ -1881 +1880 @@
                 CASE ( 'SS', 'ss' )
                    cc_in2mod(5) = ic
-                CASE ( 'HNO3', 'hno3', 'NO', 'no' )
+                CASE ( 'HNO3', 'hno3', 'NO3', 'no3', 'NO', 'no' )
                    cc_in2mod(6) = ic
-                CASE ( 'NH3', 'nh3', 'NH', 'nh' )
+                CASE ( 'NH3', 'nh3', 'NH4', 'nh4', 'NH', 'nh' )
                    cc_in2mod(7) = ic
              END SELECT
@@ -8569 +8568 @@
                    CASE ( 'SS', 'ss' )
                       aero_emission_att%cc_in2mod(5) = ic
-                   CASE ( 'HNO3', 'hno3', 'NO', 'no' )
+                   CASE ( 'HNO3', 'hno3', 'NO', 'no', 'NO3', 'no3' )
                       aero_emission_att%cc_in2mod(6) = ic
-                   CASE ( 'NH3', 'nh3', 'NH', 'nh' )
+                   CASE ( 'NH3', 'nh3', 'NH', 'nh', 'NH4', 'nh4' )
                       aero_emission_att%cc_in2mod(7) = ic
                 END SELECT

palm/trunk/TESTS/cases/urban_environment_salsa/MONITORING/urban_environment_salsa_rc

@@ -1 +1 @@
 
  ******************************    --------------------------------------------
- * PALM 6.0  Rev: 4249:42     *    atmosphere - run without 1D - prerun
+ * PALM 6.0  Rev: 4254M       *    atmosphere - run without 1D - prerun
  ******************************    --------------------------------------------
 
- Date:               2019-10-04    Run:       urban_environment_salsa__intel_def
- Time:                 08:43:18    Run-No.:   00
- Run on host:        intel_defa
+ Date:               2019-10-04    Run:       urban_environment_salsa__gfortran_
+ Time:                 14:47:55    Run-No.:   00
+ Run on host:        gfortran_d
  Number of PEs:               4    Processor grid (x,y): (   2,   2) calculated
  ------------------------------------------------------------------------------
@@ -259 +259 @@
        aerosol_number:   22 19 19  8
 
-       aerosol_mass:     24 16 16 32
+       aerosol_mass:     22 19 19 32
        (advect_particle_water = T)
-       salsa_gas:  24 16 16  5
+       salsa_gas:  22 19 19  5
        (salsa_gases_from_chem = F)