Changeset 3495 for palm/trunk/SOURCE

Timestamp:

Nov 6, 2018 3:22:17 PM (6 years ago)

Author:

kanani

Message:

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

File:

• palm/trunk/SOURCE/radiation_model_mod.f90 (modified) (7 diffs, 1 prop)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! Resort control_parameters ONLY list,
+! From branch radiation@3491 moh.hefny:
+! bugfix in calculating the apparent solar positions by updating 
+! the simulated time so that the actual time is correct.
+! 
+! 3464 2018-10-30 18:08:55Z kanani
 ! From branch resler@3462, pavelkrc:
 ! add MRT shaping function for human
@@ -517 +523 @@
 
     USE control_parameters,                                                    &
-        ONLY:  cloud_droplets, coupling_char, dz,                              &
+        ONLY:  cloud_droplets, coupling_char, dz, dt_spinup, end_time,         &
                humidity,                                                       &
                initializing_actions, io_blocks, io_group,                      &
-               latitude, longitude, large_scale_forcing, lsf_surf,             &
-               message_string, plant_canopy, pt_surface,&
-               rho_surface, surface_pressure, time_since_reference_point,      &
-               urban_surface, land_surface, end_time, spinup_time, dt_spinup
+               land_surface, large_scale_forcing,                              &
+               latitude, longitude, lsf_surf,                                  &
+               message_string, plant_canopy, pt_surface,                       &
+               rho_surface, simulated_time, spinup_time, surface_pressure,     &
+               time_since_reference_point, urban_surface
 
     USE cpulog,                                                                &
@@ -4876 +4883 @@
                    raytrace_discrete_azims)
         isd = dsidir_rev(j, i)
+!-- TODO: check if isd = -1 to report that this solar position is not precalculated
         DO isurf = 1, nsurfl
            j = surfl(iy, isurf)
@@ -7739 +7747 @@
       INTEGER(iwp)                              ::  it, i, j
       REAL(wp)                                  ::  tsrp_prev
+      REAL(wp)                                  ::  simulated_time_prev
       REAL(wp), DIMENSION(:,:), ALLOCATABLE     ::  dsidir_tmp       !< dsidir_tmp[:,i] = unit vector of i-th
                                                                      !< appreant solar direction
@@ -7753 +7762 @@
 !--   true value later
       tsrp_prev = time_since_reference_point
+      simulated_time_prev = simulated_time
       sun_direction = .TRUE.
 
@@ -7760 +7770 @@
          DO  it = 0, CEILING(spinup_time / dt_spinup)
             time_since_reference_point = -spinup_time + REAL(it, wp) * dt_spinup
+            simulated_time = simulated_time + dt_spinup
             CALL simulate_pos
          ENDDO
@@ -7767 +7778 @@
       DO  it = 0, CEILING(( end_time - spinup_time ) / dt_radiation)
          time_since_reference_point = REAL(it, wp) * dt_radiation
+         simulated_time = simulated_time + dt_spinup
          CALL simulate_pos
       ENDDO
 
       time_since_reference_point = tsrp_prev
+      simulated_time = simulated_time_prev
 
 !--   Allocate global vars which depend on ndsidir