Changeset 1691 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Oct 26, 2015 4:17:44 PM (9 years ago)

Author:

maronga

Message:

various bugfixes and modifications of the atmosphere-land-surface-radiation interaction. Completely re-written routine to calculate surface fluxes (surface_layer_fluxes.f90) that replaces prandtl_fluxes. Minor formatting corrections and renamings

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (9 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -14 +14 @@
 ! PALM. If not, see <http://www.gnu.org/licenses/>.
 !
-! Copyright 1997-2014 Leibniz Universitaet Hannover
+! Copyright 1997-2015 Leibniz Universitaet Hannover
 !--------------------------------------------------------------------------------!
 !
 ! Current revisions:
 ! ------------------
-! 
+! Added option for spin-ups without land surface and radiation models. Moved calls
+! for radiation and lan surface schemes.
 ! 
 ! Former revisions:
@@ -170 +171 @@
                averaging_interval_sp, bc_lr_cyc, bc_ns_cyc, bc_pt_t_val,       &
                bc_q_t_val, call_psolver_at_all_substeps, cloud_droplets,       &
-               cloud_physics, constant_heatflux, create_disturbances, dopr_n,  &
-               constant_diffusion, coupling_mode, coupling_start_time,         &
-               current_timestep_number, disturbance_created,                   &
-               disturbance_energy_limit, dist_range, do_sum, dt_3d,            &
-               dt_averaging_input, dt_averaging_input_pr, dt_coupling,         &
-               dt_data_output_av, dt_disturb, dt_do2d_xy, dt_do2d_xz,          &
-               dt_do2d_yz, dt_do3d, dt_domask,dt_dopts, dt_dopr,               &
+               cloud_physics, constant_flux_layer, constant_heatflux,          &
+               create_disturbances, dopr_n, constant_diffusion, coupling_mode, &
+               coupling_start_time, current_timestep_number,                   &
+               disturbance_created, disturbance_energy_limit, dist_range,      &
+               do_sum, dt_3d, dt_averaging_input, dt_averaging_input_pr,       &
+               dt_coupling, dt_data_output_av, dt_disturb, dt_do2d_xy,         &
+               dt_do2d_xz, dt_do2d_yz, dt_do3d, dt_domask,dt_dopts, dt_dopr,   &
                dt_dopr_listing, dt_dosp, dt_dots, dt_dvrp, dt_run_control,     &
                end_time, first_call_lpm, galilei_transformation, humidity,     &
@@ -183 +184 @@
                loop_optimization, lsf_surf, lsf_vert, masks, mid,              &
                netcdf_data_format, neutral, nr_timesteps_this_run, nudging,    &
-               ocean, on_device, passive_scalar, prandtl_layer, precipitation, &
+               ocean, on_device, passive_scalar, precipitation,                &
                prho_reference, pt_reference, pt_slope_offset, random_heatflux, &
                run_coupled, simulated_time, simulated_time_chr,                &
@@ -213 +214 @@
 
     USE land_surface_model_mod,                                                &
-        ONLY:  land_surface, lsm_energy_balance, lsm_soil_model
+        ONLY:  land_surface, lsm_energy_balance, lsm_soil_model,               &
+               skip_time_do_lsm
 
     USE ls_forcing_mod,                                                        &
@@ -238 +240 @@
 
     USE radiation_model_mod,                                                   &
-        ONLY: dt_radiation, radiation, radiation_clearsky,                     &
-              radiation_rrtmg, radiation_scheme, time_radiation
+        ONLY: dt_radiation, force_radiation_call, radiation,                   &
+              radiation_clearsky, radiation_rrtmg, radiation_scheme,           &
+              skip_time_do_radiation, time_radiation
 
     USE statistics,                                                            &
         ONLY:  flow_statistics_called, hom, pr_palm, sums_ls_l
+
+    USE surface_layer_fluxes_mod,                                              &
+        ONLY:  surface_layer_fluxes
 
     USE user_actions_mod,                                                      &
@@ -374 +380 @@
           ENDIF
 
-          IF ( radiation .AND. intermediate_timestep_count                     &
-               == intermediate_timestep_count_max  )  THEN
-
-               time_radiation = time_radiation + dt_3d
-
-             IF ( time_radiation >= dt_radiation )  THEN
-
-                CALL cpu_log( log_point(50), 'radiation', 'start' )
-
-                time_radiation = time_radiation - dt_radiation
-                IF ( radiation_scheme == 'clear-sky' )  THEN
-                   CALL radiation_clearsky
-                ELSEIF ( radiation_scheme == 'rrtmg' )  THEN
-                   CALL radiation_rrtmg
-                ENDIF
-
-                CALL cpu_log( log_point(50), 'radiation', 'stop' )
-             ENDIF
-          ENDIF
 !
 !--       Solve the prognostic equations. A fast cache optimized version with
@@ -631 +618 @@
 !--       velocities at the outflow in case of a non-cyclic lateral wall)
           CALL boundary_conds
-
-!
-!--       When using the land surface model: 
-!--       1) solve energy balance equation to calculate new skin temperature
-!--       2) run soil model 
-          IF ( land_surface )  THEN
-
-             CALL cpu_log( log_point(54), 'land_surface', 'start' )
-
-             CALL lsm_energy_balance
-             CALL lsm_soil_model
-
-             CALL cpu_log( log_point(54), 'land_surface', 'stop' )
-
-          ENDIF
 
 !
@@ -731 +703 @@
 
 !
-!--          First the vertical fluxes in the Prandtl layer are being computed
-             IF ( prandtl_layer )  THEN
-                CALL cpu_log( log_point(19), 'prandtl_fluxes', 'start' )
-                CALL prandtl_fluxes
-                CALL cpu_log( log_point(19), 'prandtl_fluxes', 'stop' )
-             ENDIF
-
+!--          First the vertical fluxes in the surface (constant flux) layer are computed
+             IF ( constant_flux_layer )  THEN
+                CALL cpu_log( log_point(19), 'surface_layer_fluxes', 'start' )
+                CALL surface_layer_fluxes
+                CALL cpu_log( log_point(19), 'surface_layer_fluxes', 'stop' )
+             ENDIF
+
+!
+!--          If required, solve the energy balance for the surface and run soil 
+!--          model
+             IF ( land_surface .AND. simulated_time > skip_time_do_lsm)  THEN
+
+                CALL cpu_log( log_point(54), 'land_surface', 'start' )
+                CALL lsm_energy_balance
+                CALL lsm_soil_model
+                CALL cpu_log( log_point(54), 'land_surface', 'stop' )
+             ENDIF
 !
 !--          Compute the diffusion coefficients
@@ -752 +734 @@
              CALL cpu_log( log_point(17), 'diffusivities', 'stop' )
 
+          ENDIF
+
+!
+!--       If required, calculate radiative fluxes and heating rates
+          IF ( radiation .AND. intermediate_timestep_count                     &
+               == intermediate_timestep_count_max .AND. simulated_time >    &
+               skip_time_do_radiation )  THEN
+
+               time_radiation = time_radiation + dt_3d
+
+             IF ( time_radiation >= dt_radiation .OR. force_radiation_call )   &
+             THEN
+
+                CALL cpu_log( log_point(50), 'radiation', 'start' )
+
+                IF ( .NOT. force_radiation_call )  THEN
+                   time_radiation = time_radiation - dt_radiation
+                ELSE
+                   WRITE(9,*) "Unscheduled radiation call at ", simulated_time
+                   CALL LOCAL_FLUSH ( 9 )
+                ENDIF
+
+                IF ( radiation_scheme == 'clear-sky' )  THEN
+                   CALL radiation_clearsky
+                ELSEIF ( radiation_scheme == 'rrtmg' )  THEN
+                   CALL radiation_rrtmg
+                ENDIF
+
+                CALL cpu_log( log_point(50), 'radiation', 'stop' )
+             ENDIF
           ENDIF