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

Timestamp:

Jun 1, 2007 3:25:22 PM (17 years ago)

Author:

raasch

Message:

preliminary uncomplete changes for ocean version

File:

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

palm/trunk/SOURCE/init_3d_model.f90

@@ -7 +7 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Initialization of salinity
 !
 ! Former revisions:
@@ -187 +187 @@
     ENDIF
 
+    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),    &
+                 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) )
+    ENDIF
+
 !
 !-- 3D-array for storing the dissipation, needed for calculating the sgs
@@ -285 +293 @@
           qsws   => qsws_1
           qswst  => qswst_1
-          q      => q_1;     q_p  => q_2;     tq_m => q_3;    q_m => q_3
+          q      => q_1;     q_p  => q_2;     tq_m  => q_3;    q_m => q_3
           IF ( humidity )        vpt  => vpt_1
           IF ( cloud_physics )   ql   => ql_1
@@ -292 +300 @@
              ql_c => ql_2
           ENDIF
+       ENDIF
+
+       IF ( ocean )  THEN
+          saswst => saswst_1
+          sa     => sa_1;    sa_p => sa_2;    tsa_m => sa_3
        ENDIF
 
@@ -457 +470 @@
           ENDIF
 
+          IF ( ocean )  THEN
+             DO  i = nxl-1, nxr+1
+                DO  j = nys-1, nyn+1
+                   sa(:,j,i) = sa_init
+                ENDDO
+             ENDDO
+          ENDIF
           
           IF ( constant_diffusion )  THEN
@@ -566 +586 @@
 !
 !--    Initialize fluxes at top surface
-!--    Currently, only the heatflux can be prescribed. The latent flux is
-!--    zero in this case!
+!--    Currently, only the heatflux and salinity flux can be prescribed.
+!--    The latent flux is zero in this case!
        IF ( use_top_fluxes )  THEN
 
@@ -579 +599 @@
                 qswst = 0.0
                 IF ( ASSOCIATED( qswst_m ) )  qswst_m = qswst
+             ENDIF
+
+             IF ( ocean )  THEN
+                saswst = top_salinityflux
              ENDIF
          ENDIF
@@ -744 +768 @@
        ENDIF
 
+       IF ( ocean )  THEN
+          tsa_m = 0.0
+          sa_p  = sa
+       ENDIF
+
 !
 !--    Initialize old timelevels needed for radiation boundary conditions
@@ -783 +812 @@
        e_p = e; pt_p = pt; u_p = u; v_p = v; w_p = w
        IF ( humidity  .OR.  passive_scalar )  q_p = q
+       IF ( ocean )  sa_p = sa
 
     ELSE