Changeset 1240 for palm/trunk/SOURCE/init_3d_model.f90

Timestamp:

Oct 29, 2013 1:21:31 PM (11 years ago)

Author:

heinze

Message:

Undoing commit 1239

File:

• palm/trunk/SOURCE/init_3d_model.f90 (modified) (5 diffs)

palm/trunk/SOURCE/init_3d_model.f90

@@ -23 +23 @@
 ! Current revisions:
 ! ------------------
-! Overwrite initial profiles in case of nudging
-! Inititialize shf and qsws in case of large_scale_forcing
+!
 !
 ! Former revisions:
@@ -261 +260 @@
     USE indices
     USE interfaces
-    USE ls_forcing_mod
     USE model_1d
     USE netcdf_control
@@ -782 +780 @@
        ELSEIF ( INDEX(initializing_actions, 'set_constant_profiles') /= 0 ) &
        THEN
-
-!
-!--       Overwrite initial profiles in case of nudging
-          IF ( nudging ) THEN
-             pt_init = ptnudge(:,1)
-             u_init  = unudge(:,1)
-             v_init  = vnudge(:,1)
-             IF ( humidity  .OR.  passive_scalar )  THEN
-                q_init = qnudge(:,1)
-             ENDIF
-
-             WRITE( message_string, * ) 'Initial profiles of u, v and ', &
-                 'scalars from NUDGING_DATA are used.'
-             CALL message( 'init_3d_model', 'PA0370', 0, 0, 0, 6, 0 )
-          ENDIF
-
 !
 !--       Use constructed initial profiles (velocity constant with height,
@@ -891 +873 @@
           IF ( sloping_surface )  CALL init_slope
 
-          IF(myid==0) THEN
-            PRINT*,"initial profiles from init_3d_model"
-            DO k=nzb, nzt+1
-                PRINT*, k, u(k,0,0), v(k,0,0), pt(k,0,0), q(k,0,0)
-            ENDDO
-          ENDIF
-
        ELSEIF ( INDEX(initializing_actions, 'by_user') /= 0 ) &
        THEN
@@ -973 +948 @@
              ELSE
                 shf = surface_heatflux
-!
-!--             Initialize shf with data from external file LSF_DATA
-                IF ( large_scale_forcing .AND. lsf_surf ) THEN
-                   CALL ls_forcing_surf ( simulated_time )
-                ENDIF
-
 !
 !--             Over topography surface_heatflux is replaced by wall_heatflux(0)