Changeset 124 for palm/trunk/SOURCE

Timestamp:

Oct 19, 2007 3:47:46 PM (17 years ago)

Author:

raasch

Message:

further bugfixes for the ocean part

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (2 diffs)
• init_ocean.f90 (modified) (2 diffs)
• production_e.f90 (modified) (5 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -25 +25 @@
 ------
 
+Several bugfixes in the ocean part: Initial density rho is calculated
+(init_ocean). Error in initializing u_init and v_init removed
+(check_parameters). Calculation of density flux now starts from
+nzb+1 (production_e).
+
 Bugfix: pleft/pright changed to pnorth/psouth in sendrecv of particle tail
 numbers along y, small bugfixes in the SGS part (advec_particles)
@@ -30 +35 @@
 Bugfix: model_string needed a default value (combine_plot_fields)
 
-Bugfix: initializing u_init and v_init in case of ocean runs (check_parameters)
 
-advec_particles, check_parameters, combine_plot_fields
+advec_particles, check_parameters, combine_plot_fields, init_ocean, production_e

palm/trunk/SOURCE/init_ocean.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Bugfix: Initial density rho is calculated
 !
 ! Former revisions:
@@ -73 +73 @@
     prho_reference = prho_reference / ( zu(nzt) - zu(nzb) )
 
+!
+!-- Calculate the initial potential density, based on the initial
+!-- temperature and salinity profile
+    CALL eqn_state_seawater
+
 
  END SUBROUTINE init_ocean

palm/trunk/SOURCE/production_e.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Bugfix: calculation of density flux in the ocean now starts from nzb+1
 !
 ! Former revisions:
@@ -382 +382 @@
 !--                the bottom and top surface layer
                    DO  j = nys, nyn
-                      DO  k = nzb_s_inner(j,i), nzt
+                      DO  k = nzb_s_inner(j,i)+1, nzt
                          tend(k,j,i) = tend(k,j,i) +                    &
                                        kh(k,j,i) * g / prho_reference * &
@@ -419 +419 @@
 !--                the bottom and top surface layer
                    DO  j = nys, nyn
-                      DO  k = nzb_s_inner(j,i), nzt
+                      DO  k = nzb_s_inner(j,i)+1, nzt
                          tend(k,j,i) = tend(k,j,i) -                &
                                        kh(k,j,i) * g / rho(k,j,i) * &
@@ -814 +814 @@
 !--             So far in the ocean no special treatment of density flux in the
 !--             bottom and top surface layer
-                k= nzb_s_inner(j,i)
-                tend(k,j,i) = tend(k,j,i) + kh(k,j,i) * g / prho_reference * &
-                     ( rho(k+1,j,i) - rho(k,j,i) ) * dzu(k+1)
                 DO  k = nzb_s_inner(j,i)+1, nzt
                    tend(k,j,i) = tend(k,j,i) + kh(k,j,i) * g / prho_reference * &
@@ -847 +844 @@
 !--             So far in the ocean no special treatment of density flux in the
 !--             bottom and top surface layer
-                DO  k = nzb_s_inner(j,i), nzt
+                DO  k = nzb_s_inner(j,i)+1, nzt
                    tend(k,j,i) = tend(k,j,i) + kh(k,j,i) * g / rho(k,j,i) * &
                                       ( rho(k+1,j,i) - rho(k-1,j,i) ) * dd2zu(k)