Ignore:
Timestamp:
Apr 22, 2014 3:03:56 PM (8 years ago)
Author:
boeske
Message:

large scale forcing enabled

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/prognostic_equations.f90

    r1362 r1365  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! Calls of ls_advec for large scale advection added,
     23! subroutine subsidence is only called if use_subsidence_tendencies = .F.,
     24! new argument ls_index added to the calls of subsidence
     25! +ls_index
    2326!
    2427! Former revisions:
     
    143146               dp_level_ind_b, dp_smooth_factor, dpdxy, dt_3d, humidity,       &
    144147               icloud_scheme, inflow_l, intermediate_timestep_count,           &
    145                intermediate_timestep_count_max, large_scale_subsidence,        &
    146                neutral, nudging, ocean, outflow_l, outflow_s, passive_scalar,  &
    147                plant_canopy, precipitation, prho_reference, prho_reference,    &
    148                prho_reference, pt_reference, pt_reference, pt_reference,       &
    149                radiation, scalar_advec, scalar_advec, simulated_time,          &
    150                sloping_surface, timestep_scheme, tsc, use_upstream_for_tke,    &
     148               intermediate_timestep_count_max, large_scale_forcing,           &
     149               large_scale_subsidence, neutral, nudging, ocean, outflow_l,     &
     150               outflow_s, passive_scalar, plant_canopy, precipitation,         &
     151               prho_reference, prho_reference, prho_reference, pt_reference,   &
     152               pt_reference, pt_reference, radiation, scalar_advec,            &
     153               scalar_advec, simulated_time, sloping_surface, timestep_scheme, &
     154               tsc, use_subsidence_tendencies, use_upstream_for_tke,           &
    151155               use_upstream_for_tke, use_upstream_for_tke, wall_heatflux,      &
    152156               wall_nrflux, wall_qflux, wall_qflux, wall_qflux, wall_qrflux,   &
     
    222226
    223227    USE kinds
     228
     229    USE ls_forcing_mod,                                                        &
     230        ONLY:  ls_advec
    224231
    225232    USE microphysics_mod,                                                      &
     
    307314          i_omp_start = i
    308315       ENDIF
    309  
     316
    310317       DO  j = nys, nyn
    311318!
     
    537544
    538545!
     546!--          Large scale advection
     547             IF ( large_scale_forcing )  THEN
     548                CALL ls_advec( i, j, simulated_time, 'pt' )
     549             ENDIF     
     550
     551!
    539552!--          If required, compute effect of large-scale subsidence/ascent
    540              IF ( large_scale_subsidence )  THEN
    541                 CALL subsidence( i, j, tend, pt, pt_init )
     553             IF ( large_scale_subsidence  .AND.                                &
     554                  .NOT. use_subsidence_tendencies )  THEN
     555                CALL subsidence( i, j, tend, pt, pt_init, 2 )
    542556             ENDIF
    543557
     
    662676
    663677!
     678!--          Large scale advection
     679             IF ( large_scale_forcing )  THEN
     680                CALL ls_advec( i, j, simulated_time, 'q' )
     681             ENDIF
     682
     683!
    664684!--          If required compute influence of large-scale subsidence/ascent
    665              IF ( large_scale_subsidence )  THEN
    666                 CALL subsidence( i, j, tend, q, q_init )
     685             IF ( large_scale_subsidence  .AND.                                &
     686                  .NOT. use_subsidence_tendencies )  THEN
     687                CALL subsidence( i, j, tend, q, q_init, 3 )
    667688             ENDIF
    668689
     
    11771198
    11781199!
     1200!--    Large scale advection
     1201       IF ( large_scale_forcing )  THEN
     1202          CALL ls_advec( simulated_time, 'pt' )
     1203       ENDIF
     1204
     1205!
    11791206!--    If required compute influence of large-scale subsidence/ascent
    1180        IF ( large_scale_subsidence )  THEN
    1181           CALL subsidence( tend, pt, pt_init )
     1207       IF ( large_scale_subsidence  .AND.                                      &
     1208            .NOT. use_subsidence_tendencies )  THEN
     1209          CALL subsidence( tend, pt, pt_init, 2 )
    11821210       ENDIF
    11831211
     
    13651393!--    Sink or source of scalar concentration due to canopy elements
    13661394       IF ( plant_canopy ) CALL plant_canopy_model( 5 )
    1367        
     1395
     1396!
     1397!--    Large scale advection
     1398       IF ( large_scale_forcing )  THEN
     1399          CALL ls_advec( simulated_time, 'q' )
     1400       ENDIF
     1401
    13681402!
    13691403!--    If required compute influence of large-scale subsidence/ascent
    1370        IF ( large_scale_subsidence )  THEN
    1371          CALL subsidence( tend, q, q_init )
     1404       IF ( large_scale_subsidence  .AND.                                      &
     1405            .NOT. use_subsidence_tendencies )  THEN
     1406         CALL subsidence( tend, q, q_init, 3 )
    13721407       ENDIF
    13731408
     
    19782013
    19792014!
     2015!--    Large scale advection
     2016       IF ( large_scale_forcing )  THEN
     2017          CALL ls_advec( simulated_time, 'pt' )
     2018       ENDIF
     2019
     2020!
    19802021!--    If required compute influence of large-scale subsidence/ascent
    1981        IF ( large_scale_subsidence )  THEN
    1982           CALL subsidence( tend, pt, pt_init )
     2022       IF ( large_scale_subsidence  .AND.                                      &
     2023            .NOT. use_subsidence_tendencies )  THEN
     2024          CALL subsidence( tend, pt, pt_init, 2 )
    19832025       ENDIF
    19842026
     
    21422184
    21432185!
     2186!--    Large scale advection
     2187       IF ( large_scale_forcing )  THEN
     2188          CALL ls_advec( simulated_time, 'q' )
     2189       ENDIF
     2190
     2191!
    21442192!--    If required compute influence of large-scale subsidence/ascent
    2145        IF ( large_scale_subsidence )  THEN
    2146          CALL subsidence( tend, q, q_init )
     2193       IF ( large_scale_subsidence  .AND.                                      &
     2194            .NOT. use_subsidence_tendencies )  THEN
     2195         CALL subsidence( tend, q, q_init, 3 )
    21472196       ENDIF
    21482197
Note: See TracChangeset for help on using the changeset viewer.