Changeset 4280 for palm/trunk/SOURCE/salsa_mod.f90

Timestamp:

Oct 29, 2019 2:34:15 PM (5 years ago)

Author:

monakurppa

Message:

Correct recent bugs in salsa_mod and remove chemistry specific stuff in netcdf_data_iput_mod

• A boundary conditions bug in salsa_mod: set top boundary to its default value (neumann) if nesting is turned off
• In salsa_nesting_offl_bc, correct fac_dt to apply time_utc_init
• Remove chemistry specific parts (inside an if clause id==id_emis) in get_variable_4d_to_3d_real and get_variable_5d_to_4d_real

File:

• palm/trunk/SOURCE/salsa_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/salsa_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Corrected a bug in boundary conditions and fac_dt in offline nesting
+! 
+! 4273 2019-10-24 13:40:54Z monakurppa
 ! - Rename nest_salsa to nesting_salsa
 ! - Correct some errors in boundary condition flags
@@ -217 +220 @@
 !>
 !> @todo Apply information from emission_stack_height to lift emission sources
-!> @todo emission mode "parameterized", i.e. based on street type
 !> @todo Allow insoluble emissions
-!> @todo Apply flux limiter in prognostic equations
 !------------------------------------------------------------------------------!
  MODULE salsa_mod
@@ -1121 +1122 @@
 !
 !-- For nested runs, explicitly set nesting boundary conditions.
-    IF ( nesting_salsa  .AND. child_domain )  bc_salsa_t = 'nested'
+    IF ( child_domain )  THEN
+       IF ( nesting_salsa )  THEN
+          bc_salsa_t = 'nested'
+       ELSE
+          bc_salsa_t = 'neumann'
+       ENDIF
+    ENDIF
 !
 !-- Set boundary conditions also in case the model is offline-nested in larger-scale models.
@@ -1177 +1184 @@
        init_gases_type = 1
     ENDIF
+
 
  END SUBROUTINE salsa_check_parameters
@@ -8943 +8951 @@
                                                                aero_emission%mass_fracs(:,cc_i2m(7))
 !
-!--             Allocate and read surface emission data (in total PM)
+!--             Allocate and read surface emission data (in total PM, get_variable_3d_real)
                 ALLOCATE( aero_emission%def_data(nys:nyn,nxl:nxr,1:aero_emission_att%ncat) )
                 CALL get_variable( id_salsa, 'aerosol_emission_values', aero_emission%def_data,    &
@@ -9113 +9121 @@
                        source_array(nys:nyn,nxl:nxr,1:nbins_aerosol) )
 !
-!--          Read in the next time step
+!--          Read in the next time step (get_variable_4d_to_3d_real)
              CALL get_variable( id_salsa, 'aerosol_emission_values', aero_emission%preproc_data,   &
                                 aero_emission_att%tind, 0, aero_emission_att%ncat-1,               &
@@ -12184 +12192 @@
 !-- Determine interpolation factor and limit it to 1. This is because t+dt can slightly exceed
 !-- time(tind_p) before boundary data is updated again.
-    fac_dt = ( time_since_reference_point - salsa_nest_offl%time(salsa_nest_offl%tind)  + dt_3d )  &
-             / ( salsa_nest_offl%time(salsa_nest_offl%tind_p) -                                    &
-                 salsa_nest_offl%time(salsa_nest_offl%tind) )
+    fac_dt = ( time_utc_init + time_since_reference_point -                                        &
+               salsa_nest_offl%time(salsa_nest_offl%tind) + dt_3d ) /                              &
+             ( salsa_nest_offl%time(salsa_nest_offl%tind_p) -                                      &
+               salsa_nest_offl%time(salsa_nest_offl%tind) )
     fac_dt = MIN( 1.0_wp, fac_dt )