Changeset 3495


Ignore:
Timestamp:
Nov 6, 2018 3:22:17 PM (3 years ago)
Author:
kanani
Message:

bugfix in calculating the apparent solar positions, resort ONLY list (radiation_model_mod)

File:
1 edited

Legend:

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

    • Property svn:mergeinfo set to (toggle deleted branches)
      /palm/branches/chemistry/SOURCE/radiation_model_mod.f902047-3190,​3218-3297
      /palm/branches/forwind/SOURCE/radiation_model_mod.f901564-1913
      /palm/branches/palm4u/SOURCE/radiation_model_mod.f902540-2692
      /palm/branches/radiation/SOURCE/radiation_model_mod.f902081-3493
      /palm/branches/rans/SOURCE/radiation_model_mod.f902078-3128
      /palm/branches/resler/SOURCE/radiation_model_mod.f902023-3336
      /palm/branches/salsa/SOURCE/radiation_model_mod.f902503-3460
      /palm/branches/fricke/SOURCE/radiation_model_mod.f90942-977
      /palm/branches/hoffmann/SOURCE/radiation_model_mod.f90989-1052
      /palm/branches/letzel/masked_output/SOURCE/radiation_model_mod.f90296-409
      /palm/branches/suehring/radiation_model_mod.f90423-666
    r3464 r3495  
    2828! -----------------
    2929! $Id$
     30! Resort control_parameters ONLY list,
     31! From branch radiation@3491 moh.hefny:
     32! bugfix in calculating the apparent solar positions by updating
     33! the simulated time so that the actual time is correct.
     34!
     35! 3464 2018-10-30 18:08:55Z kanani
    3036! From branch resler@3462, pavelkrc:
    3137! add MRT shaping function for human
     
    517523
    518524    USE control_parameters,                                                    &
    519         ONLY:  cloud_droplets, coupling_char, dz,                              &
     525        ONLY:  cloud_droplets, coupling_char, dz, dt_spinup, end_time,         &
    520526               humidity,                                                       &
    521527               initializing_actions, io_blocks, io_group,                      &
    522                latitude, longitude, large_scale_forcing, lsf_surf,             &
    523                message_string, plant_canopy, pt_surface,&
    524                rho_surface, surface_pressure, time_since_reference_point,      &
    525                urban_surface, land_surface, end_time, spinup_time, dt_spinup
     528               land_surface, large_scale_forcing,                              &
     529               latitude, longitude, lsf_surf,                                  &
     530               message_string, plant_canopy, pt_surface,                       &
     531               rho_surface, simulated_time, spinup_time, surface_pressure,     &
     532               time_since_reference_point, urban_surface
    526533
    527534    USE cpulog,                                                                &
     
    48764883                   raytrace_discrete_azims)
    48774884        isd = dsidir_rev(j, i)
     4885!-- TODO: check if isd = -1 to report that this solar position is not precalculated
    48784886        DO isurf = 1, nsurfl
    48794887           j = surfl(iy, isurf)
     
    77397747      INTEGER(iwp)                              ::  it, i, j
    77407748      REAL(wp)                                  ::  tsrp_prev
     7749      REAL(wp)                                  ::  simulated_time_prev
    77417750      REAL(wp), DIMENSION(:,:), ALLOCATABLE     ::  dsidir_tmp       !< dsidir_tmp[:,i] = unit vector of i-th
    77427751                                                                     !< appreant solar direction
     
    77537762!--   true value later
    77547763      tsrp_prev = time_since_reference_point
     7764      simulated_time_prev = simulated_time
    77557765      sun_direction = .TRUE.
    77567766
     
    77607770         DO  it = 0, CEILING(spinup_time / dt_spinup)
    77617771            time_since_reference_point = -spinup_time + REAL(it, wp) * dt_spinup
     7772            simulated_time = simulated_time + dt_spinup
    77627773            CALL simulate_pos
    77637774         ENDDO
     
    77677778      DO  it = 0, CEILING(( end_time - spinup_time ) / dt_radiation)
    77687779         time_since_reference_point = REAL(it, wp) * dt_radiation
     7780         simulated_time = simulated_time + dt_spinup
    77697781         CALL simulate_pos
    77707782      ENDDO
    77717783
    77727784      time_since_reference_point = tsrp_prev
     7785      simulated_time = simulated_time_prev
    77737786
    77747787!--   Allocate global vars which depend on ndsidir
Note: See TracChangeset for help on using the changeset viewer.