Changeset 4487 for palm/trunk/SOURCE
- Timestamp:
- Apr 3, 2020 9:38:20 AM (5 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
-
chemistry_model_mod.f90 (modified) (5 diffs)
-
salsa_mod.f90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/chemistry_model_mod.f90
r4481 r4487 27 27 ! ----------------- 28 28 ! $Id$ 29 ! bugfix for subroutine calls that contain the decycle_chem switches as arguments 30 ! 31 ! 4481 2020-03-31 18:55:54Z maronga 29 32 ! use statement for exchange horiz added, 30 33 ! bugfix for call of exchange horiz 2d … … 2037 2040 !-- appear under shear-free stable conditions. 2038 2041 CALL ws_init_flags_scalar( & 2039 bc_dirichlet_l .OR. bc_radiation_l .OR. decycle_chem_lr, &2040 bc_dirichlet_n .OR. bc_radiation_n .OR. decycle_chem_ns, &2041 bc_dirichlet_r .OR. bc_radiation_r .OR. decycle_chem_lr, &2042 bc_dirichlet_s .OR. bc_radiation_s .OR. decycle_chem_ns, &2042 bc_dirichlet_l .OR. bc_radiation_l .OR. ( decycle_chem_lr .AND. nxl == 0 ), & 2043 bc_dirichlet_n .OR. bc_radiation_n .OR. ( decycle_chem_ns .AND. nyn == ny ), & 2044 bc_dirichlet_r .OR. bc_radiation_r .OR. ( decycle_chem_lr .AND. nxr == nx ), & 2045 bc_dirichlet_s .OR. bc_radiation_s .OR. ( decycle_chem_ns .AND. nys == 0 ), & 2043 2046 cs_advc_flags_s, .TRUE. ) 2044 2047 ENDIF … … 2829 2832 IF ( ws_scheme_sca ) THEN 2830 2833 CALL advec_s_ws( cs_advc_flags_s, chem_species(ilsp)%conc, 'kc', & 2831 bc_dirichlet_l .OR. bc_radiation_l .OR. decycle_chem_lr,&2832 bc_dirichlet_n .OR. bc_radiation_n .OR. decycle_chem_ns,&2833 bc_dirichlet_r .OR. bc_radiation_r .OR. decycle_chem_lr,&2834 bc_dirichlet_s .OR. bc_radiation_s .OR. decycle_chem_ns)2834 bc_dirichlet_l .OR. bc_radiation_l .OR. ( decycle_chem_lr .AND. nxl == 0 ), & 2835 bc_dirichlet_n .OR. bc_radiation_n .OR. ( decycle_chem_ns .AND. nyn == ny ), & 2836 bc_dirichlet_r .OR. bc_radiation_r .OR. ( decycle_chem_lr .AND. nxr == nx ), & 2837 bc_dirichlet_s .OR. bc_radiation_s .OR. ( decycle_chem_ns .AND. nys == 0 ) ) 2835 2838 ELSE 2836 2839 CALL advec_s_pw( chem_species(ilsp)%conc ) … … 2939 2942 IF ( timestep_scheme(1:5) == 'runge' ) THEN 2940 2943 IF ( ws_scheme_sca ) THEN 2941 CALL advec_s_ws( cs_advc_flags_s, & 2942 i, & 2943 j, & 2944 chem_species(ilsp)%conc, & 2945 'kc', & 2944 CALL advec_s_ws( cs_advc_flags_s, i, j, chem_species(ilsp)%conc, 'kc', & 2946 2945 chem_species(ilsp)%flux_s_cs, & 2947 2946 chem_species(ilsp)%diss_s_cs, & … … 2950 2949 i_omp_start, & 2951 2950 tn, & 2952 bc_dirichlet_l .OR. bc_radiation_l .OR. decycle_chem_lr,&2953 bc_dirichlet_n .OR. bc_radiation_n .OR. decycle_chem_ns,&2954 bc_dirichlet_r .OR. bc_radiation_r .OR. decycle_chem_lr,&2955 bc_dirichlet_s .OR. bc_radiation_s .OR. decycle_chem_ns,&2956 2951 bc_dirichlet_l .OR. bc_radiation_l .OR. ( decycle_chem_lr .AND. nxl == 0 ), & 2952 bc_dirichlet_n .OR. bc_radiation_n .OR. ( decycle_chem_ns .AND. nyn == ny ), & 2953 bc_dirichlet_r .OR. bc_radiation_r .OR. ( decycle_chem_lr .AND. nxr == nx ), & 2954 bc_dirichlet_s .OR. bc_radiation_s .OR. ( decycle_chem_ns .AND. nys == 0 ), & 2955 monotonic_limiter_z ) 2957 2956 ELSE 2958 2957 CALL advec_s_pw( i, j, chem_species(ilsp)%conc ) -
palm/trunk/SOURCE/salsa_mod.f90
r4481 r4487 26 26 ! ----------------- 27 27 ! $Id$ 28 ! bugfix for subroutine calls that contain the decycle_salsa switches as arguments 29 ! 30 ! 4481 2020-03-31 18:55:54Z maronga 28 31 ! Bug fix to the previous commit: the logical switch monotonic_limiter_z missing 29 32 ! from advec_s_ws in salsa_tendency_ij … … 1748 1751 !-- oscillations, which are responsible for high concentration maxima that may appear e.g. under 1749 1752 !-- shear-free stable conditions. 1750 CALL ws_init_flags_scalar( bc_dirichlet_l .OR. bc_radiation_l .OR. decycle_salsa_lr, & 1751 bc_dirichlet_n .OR. bc_radiation_n .OR. decycle_salsa_ns, & 1752 bc_dirichlet_r .OR. bc_radiation_r .OR. decycle_salsa_lr, & 1753 bc_dirichlet_s .OR. bc_radiation_s .OR. decycle_salsa_ns, & 1754 salsa_advc_flags_s, .TRUE. ) 1753 CALL ws_init_flags_scalar( & 1754 bc_dirichlet_l .OR. bc_radiation_l .OR. ( decycle_salsa_lr .AND. nxl == 0 ), & 1755 bc_dirichlet_n .OR. bc_radiation_n .OR. ( decycle_salsa_ns .AND. nyn == ny ), & 1756 bc_dirichlet_r .OR. bc_radiation_r .OR. ( decycle_salsa_lr .AND. nxr == nx ), & 1757 bc_dirichlet_s .OR. bc_radiation_s .OR. ( decycle_salsa_ns .AND. nys == 0 ), & 1758 salsa_advc_flags_s, .TRUE. ) 1755 1759 ENDIF 1756 1760 … … 8105 8109 IF ( ws_scheme_sca ) THEN 8106 8110 CALL advec_s_ws( salsa_advc_flags_s, i, j, rs, id, & 8107 flux_s, diss_s, flux_l, diss_l, i_omp_start, tn,&8108 bc_dirichlet_l .OR. bc_radiation_l .OR. decycle_salsa_lr,&8109 bc_dirichlet_n .OR. bc_radiation_n .OR. decycle_salsa_ns,&8110 bc_dirichlet_r .OR. bc_radiation_r .OR. decycle_salsa_lr,&8111 bc_dirichlet_s .OR. bc_radiation_s .OR. decycle_salsa_ns,&8112 8111 flux_s, diss_s, flux_l, diss_l, i_omp_start, tn, & 8112 bc_dirichlet_l .OR. bc_radiation_l .OR. ( decycle_salsa_lr .AND. nxl == 0 ), & 8113 bc_dirichlet_n .OR. bc_radiation_n .OR. ( decycle_salsa_ns .AND. nyn == ny ), & 8114 bc_dirichlet_r .OR. bc_radiation_r .OR. ( decycle_salsa_lr .AND. nxr == nx ), & 8115 bc_dirichlet_s .OR. bc_radiation_s .OR. ( decycle_salsa_ns .AND. nys == 0 ), & 8116 monotonic_limiter_z ) 8113 8117 ELSE 8114 8118 CALL advec_s_pw( i, j, rs ) … … 8242 8246 IF ( ws_scheme_sca ) THEN 8243 8247 CALL advec_s_ws( salsa_advc_flags_s, rs, id, & 8244 bc_dirichlet_l .OR. bc_radiation_l .OR. decycle_salsa_lr,&8245 bc_dirichlet_n .OR. bc_radiation_n .OR. decycle_salsa_ns,&8246 bc_dirichlet_r .OR. bc_radiation_r .OR. decycle_salsa_lr,&8247 bc_dirichlet_s .OR. bc_radiation_s .OR. decycle_salsa_ns)8248 bc_dirichlet_l .OR. bc_radiation_l .OR. ( decycle_salsa_lr .AND. nxl == 0 ), & 8249 bc_dirichlet_n .OR. bc_radiation_n .OR. ( decycle_salsa_ns .AND. nyn == ny ), & 8250 bc_dirichlet_r .OR. bc_radiation_r .OR. ( decycle_salsa_lr .AND. nxr == nx ), & 8251 bc_dirichlet_s .OR. bc_radiation_s .OR. ( decycle_salsa_ns .AND. nys == 0 ) ) 8248 8252 ELSE 8249 8253 CALL advec_s_pw( rs )
Note: See TracChangeset
for help on using the changeset viewer.
