Changeset 2705

Timestamp:

Dec 18, 2017 11:26:23 AM (6 years ago)

Author:

maronga

Message:

minor bugfix for restarts

Location:

palm/trunk/SOURCE

Files:

• init_3d_model.f90 (modified) (3 diffs)
• land_surface_model_mod.f90 (modified) (3 diffs)
• urban_surface_mod.f90 (modified) (1 diff)

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for reading initial profiles from ls/nuding file
+! 
+! 2701 2017-12-15 15:40:50Z suehring
 ! Bugfix, missing initialization of surface attributes in case of 
 ! inifor-initialization branch
@@ -1024 +1027 @@
 
 !
+!-- Initialize nudging if required
+    IF ( nudging )  THEN
+       CALL nudge_init
+    ENDIF
+
+!
+!-- Initialize reading of large scale forcing from external file - if required
+    IF ( large_scale_forcing  .OR.  forcing )  THEN
+       CALL lsf_init
+    ENDIF
+
+!
 !-- Allocate arrays containing the RK coefficient for calculation of 
 !-- perturbation pressure and turbulent fluxes. At this point values are
@@ -2173 +2188 @@
 
 !
-!-- Initialize nudging if required
-    IF ( nudging )  THEN
-       CALL nudge_init
-    ENDIF
-
-!
-!-- Initialize reading of large scale forcing from external file - if required
-    IF ( large_scale_forcing  .OR.  forcing )  THEN
-       CALL lsf_init
-    ENDIF
-!
 !-- Initialize surface forcing corresponding to large-scale forcing. Therein, 
 !-- initialize heat-fluxes, etc. via datatype. Revise it later!

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in binary output (wrong sequence)
+! 
+! 2696 2017-12-14 17:12:51Z kanani
 ! Bugfix: missing USE statement for calc_mean_profile
 ! do not write surface temperatures onto pt array as this might cause 
@@ -5746 +5749 @@
 
     IF ( write_binary )  THEN
+
+
+       WRITE ( 14 ) 'ns_h_on_file_lsm    '
+       WRITE ( 14 ) surf_lsm_h%ns
+       WRITE ( 14 ) 'ns_v_on_file_lsm    '
+       WRITE ( 14 ) surf_lsm_v(0:3)%ns
+
        IF ( ALLOCATED( c_liq_av ) )  THEN
           WRITE ( 14 )  'c_liq_av            ';  WRITE ( 14 ) c_liq_av
@@ -5779 +5789 @@
           WRITE ( 14 )  't_soil_av           ';  WRITE ( 14 )  t_soil_av
        ENDIF
-
-
-       WRITE ( 14 ) 'ns_h_on_file_lsm    '
-       WRITE ( 14 ) surf_lsm_h%ns
-       WRITE ( 14 ) 'ns_v_on_file_lsm    '
-       WRITE ( 14 ) surf_lsm_v(0:3)%ns
        
        WRITE ( 14 ) 'lsm_start_index_h   '

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! ------------------
-! Workaround for calculation of r_a
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Workaround for calculation of r_a
+! 
+! 2703 2017-12-15 20:12:38Z maronga
 ! - Bugfix in calculation of pt_surface and related fluxes. (BM)
 ! - Do not write surface temperatures onto pt array as this might cause