Changeset 96 for palm/trunk/SOURCE/prognostic_equations.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/prognostic_equations.f90 (modified) (8 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! prognostic equation for salinity
-! new argument zw in calls of diffusion_e
+! prognostic equation for salinity, density is calculated from equation of
+! state for seawater, +eqn_state_seawater_mod
+! new argument zw in calls of diffusion_e, calc_mean_pt_profile renamed
+! calc_mean_profile
 !
 ! Former revisions:
@@ -41 +43 @@
     USE control_parameters
     USE cpulog
+    USE eqn_state_seawater_mod
     USE grid_variables
     USE indices
@@ -107 +110 @@
 !-- Calculate those variables needed in the tendency terms which need
 !-- global communication
-    CALL calc_mean_pt_profile( pt, 4 )
-    IF ( humidity )  CALL calc_mean_pt_profile( vpt, 44 )
+    CALL calc_mean_profile( pt, 4 )
+    IF ( ocean    )  CALL calc_mean_profile( rho, 64 )
+    IF ( humidity )  CALL calc_mean_profile( vpt, 44 )
 
 !
@@ -495 +499 @@
                 ENDIF
              ENDIF
+
+!
+!--          Calculate density by the equation of state for seawater
+             CALL eqn_state_seawater( i, j )
 
           ENDDO
@@ -758 +766 @@
 !-- Calculate those variables needed in the tendency terms which need
 !-- global communication
-    CALL calc_mean_pt_profile( pt, 4 )
-    IF ( humidity )  CALL calc_mean_pt_profile( vpt, 44 )
+    CALL calc_mean_profile( pt, 4 )
+    IF ( ocean    )  CALL calc_mean_profile( rho, 64 )
+    IF ( humidity )  CALL calc_mean_profile( vpt, 44 )
     IF ( .NOT. constant_diffusion )  CALL production_e_init
 
@@ -1020 +1029 @@
                    ENDIF
                 ENDIF
+
+!
+!--             Calculate density by the equation of state for seawater
+                CALL eqn_state_seawater( i, j )
 
              ENDIF
@@ -1178 +1191 @@
 !-- Calculate those variables needed in the tendency terms which need
 !-- global communication
-    CALL calc_mean_pt_profile( pt, 4 )
-    IF ( humidity )  CALL calc_mean_pt_profile( vpt, 44 )
+    CALL calc_mean_profile( pt, 4 )
+    IF ( ocean    )  CALL calc_mean_profile( rho, 64 )
+    IF ( humidity )  CALL calc_mean_profile( vpt, 44 )
 
 !
@@ -1589 +1603 @@
 
        CALL cpu_log( log_point(37), 'sa-equation', 'stop' )
+
+!
+!--    Calculate density by the equation of state for seawater
+       CALL cpu_log( log_point(38), 'eqns-seawater', 'start' )
+       CALL eqn_state_seawater
+       CALL cpu_log( log_point(38), 'eqns-seawater', 'stop' )
 
     ENDIF