Changeset 2237 for palm/trunk/SOURCE

Timestamp:

May 31, 2017 10:34:53 AM (7 years ago)

Author:

suehring

Message:

Bugfixes in Makefile and land_surface_model_mod

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (4 diffs)
• land_surface_model_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Bugfix, add dependencies on surface_mod for surface_coupler, 
+# plant_canopy_model_mod and ls_forcing_mod 
+# 
+# 2233 2017-05-30 18:08:54Z suehring
 #
 # 2232 2017-05-30 17:47:52Z suehring
@@ -521 +525 @@
 lpm_write_exchange_statistics.o: modules.o mod_kinds.o mod_particle_attributes.o
 lpm_write_restart_file.o: modules.o mod_kinds.o mod_particle_attributes.o
-ls_forcing_mod.o: modules.o cpulog_mod.o mod_kinds.o
+ls_forcing_mod.o: modules.o cpulog_mod.o mod_kinds.o surface_mod.o
 message.o: modules.o mod_kinds.o pmc_interface_mod.o
 microphysics_mod.o: modules.o cpulog_mod.o mod_kinds.o surface_mod.o
@@ -537 +541 @@
    plant_canopy_model_mod.o pmc_interface_mod.o progress_bar_mod.o spectra_mod.o \
    radiation_model_mod.o microphysics_mod.o virtual_flight_mod.o wind_turbine_model_mod.o
-plant_canopy_model_mod.o: modules.o mod_kinds.o
+plant_canopy_model_mod.o: modules.o mod_kinds.o surface_mod.o
 pmc_interface_mod.o: modules.o mod_kinds.o pmc_child_mod.o pmc_general_mod.o \
         pmc_handle_communicator_mod.o pmc_mpi_wrapper_mod.o pmc_parent_mod.o
@@ -579 +583 @@
 sum_up_3d_data.o: modules.o cpulog_mod.o mod_kinds.o land_surface_model_mod.o \
                   radiation_model_mod.o surface_mod.o urban_surface_mod.o
-surface_coupler.o: modules.o cpulog_mod.o mod_kinds.o
+surface_coupler.o: modules.o cpulog_mod.o mod_kinds.o surface_mod.o
 surface_layer_fluxes_mod.o: modules.o mod_kinds.o exchange_horiz_2d.o land_surface_model_mod.o \
         urban_surface_mod.o surface_mod.o

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in write restart data
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -167 +170 @@
 !> DALES and UCLA-LES models.
 !>
+!> @todo Restart data for vertical natural land-surfaces
 !> @todo Extensive verification energy-balance solver for vertical surfaces, 
 !>       e.g. parametrization of r_a
@@ -3772 +3776 @@
           WRITE ( 14 )  'lai_av              ';  WRITE ( 14 )  lai_av
        ENDIF
-       WRITE ( 14 )     'm_liq_eb            ';  WRITE ( 14 )  m_liq_eb_h
+       WRITE ( 14 )     'm_liq_eb            ';  WRITE ( 14 )  m_liq_eb_h%var_1d
        IF ( ALLOCATED( m_liq_eb_av ) )  THEN
           WRITE ( 14 )  'm_liq_eb_av         ';  WRITE ( 14 )  m_liq_eb_av
        ENDIF
-       WRITE ( 14 )     'm_soil              ';  WRITE ( 14 )  m_soil_h
+       WRITE ( 14 )     'm_soil              ';  WRITE ( 14 )  m_soil_h%var_2d
        IF ( ALLOCATED( m_soil_av ) )  THEN
           WRITE ( 14 )  'm_soil_av           ';  WRITE ( 14 )  m_soil_av
@@ -3795 +3799 @@
           WRITE ( 14 )  'shf_eb_av           ';  WRITE ( 14 )  shf_eb_av
        ENDIF
-       WRITE ( 14 )     't_soil              ';  WRITE ( 14 )  t_soil_h
+       WRITE ( 14 )     't_soil              ';  WRITE ( 14 )  t_soil_h%var_2d
        IF ( ALLOCATED( t_soil_av ) )  THEN
           WRITE ( 14 )  't_soil_av           ';  WRITE ( 14 )  t_soil_av