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

Timestamp:

Jun 2, 2007 4:48:38 PM (17 years ago)

Author:

raasch

Message:

further preliminary uncomplete changes for ocean version

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -7 +7 @@
 ! Actual revisions:
 ! -----------------
-! Initialization of salinity
+! Initialization of salinity, call of init_ocean
 !
 ! Former revisions:
@@ -188 +188 @@
 
     IF ( ocean )  THEN
-       ALLOCATE( saswst_1(nys-1:nyn+1,nxl-1:nxr+1) )
-       ALLOCATE( r(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1),    &
+       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), &
@@ -303 +304 @@
 
        IF ( ocean )  THEN
+          saswsb => saswsb_1
           saswst => saswst_1
           sa     => sa_1;    sa_p => sa_2;    tsa_m => sa_3
@@ -602 +604 @@
 
              IF ( ocean )  THEN
+                saswsb = bottom_salinityflux
                 saswst = top_salinityflux
              ENDIF
@@ -821 +824 @@
        CALL local_stop
     ENDIF
+
+!
+!-- If required, initialize quantities needed for the ocean model
+    IF ( ocean )  CALL init_ocean
 
 !