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

Timestamp:

Jun 4, 2007 8:07:41 AM (17 years ago)

Author:

raasch

Message:

more preliminary uncomplete changes for ocean version

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -190 +190 @@
        ALLOCATE( saswsb_1(nys-1:nyn+1,nxl-1:nxr+1), &
                  saswst_1(nys-1:nyn+1,nxl-1:nxr+1) )
-       ALLOCATE( rho(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1),  &
-                 sa_1(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1), &
-                 sa_2(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1), &
+       ALLOCATE( rho_1(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1), &
+                 sa_1(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1),  &
+                 sa_2(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1),  &
                  sa_3(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
+       rho => rho_1  ! routine calc_mean_profile requires density to be a
+                     ! pointer
     ENDIF
 
@@ -826 +828 @@
 
 !
-!-- If required, initialize quantities needed for the ocean model
-    IF ( ocean )  CALL init_ocean
-
-!
 !-- If required, initialize dvrp-software
     IF ( dt_dvrp /= 9999999.9 )  CALL init_dvrp
 
-!
-!-- If required, initialize quantities for handling cloud physics
-!-- This routine must be called before init_particles, because
-!-- otherwise, array pt_d_t, needed in data_output_dvrp (called by
-!-- init_particles) is not defined.
-    CALL init_cloud_physics
+    IF ( ocean )  THEN
+!
+!--    Initialize quantities needed for the ocean model
+       CALL init_ocean
+    ELSE
+!
+!--    Initialize quantities for handling cloud physics
+!--    This routine must be called before init_particles, because
+!--    otherwise, array pt_d_t, needed in data_output_dvrp (called by
+!--    init_particles) is not defined.
+       CALL init_cloud_physics
+    ENDIF
 
 !