Changeset 388 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Sep 23, 2009 9:40:33 AM (15 years ago)

Author:

raasch

Message:

in-situ AND potential density are calculated and used in the ocean version

File:

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

palm/trunk/SOURCE/prognostic_equations.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
+! prho is used instead of rho in diffusion_e,
 ! external pressure gradient
 !
@@ -330 +331 @@
           CALL coriolis( i, j, 3 )
           IF ( ocean )  THEN
-             CALL buoyancy( i, j, rho, prho_reference, 3, 64 )
+             CALL buoyancy( i, j, rho, rho_reference, 3, 64 )
           ELSE
              IF ( .NOT. humidity )  THEN
@@ -725 +726 @@
                 IF ( .NOT. humidity )  THEN
                    IF ( ocean )  THEN
-                      CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e, km,   &
-                                        l_grid, rho, prho_reference, rif, tend, &
-                                        zu, zw )
+                      CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e, km,  &
+                                        l_grid, prho, prho_reference, rif,     &
+                                        tend, zu, zw )
                    ELSE
-                      CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e, km, &
-                                        l_grid, pt, pt_reference, rif, tend,  &
+                      CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e, km,  &
+                                        l_grid, pt, pt_reference, rif, tend,   &
                                         zu, zw )
                    ENDIF
@@ -769 +770 @@
                       IF ( ocean )  THEN
                          CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e,  &
-                                           km, l_grid, rho, prho_reference,   &
+                                           km, l_grid, prho, prho_reference,  &
                                            rif, tend, zu, zw )
                       ELSE
@@ -1013 +1014 @@
           CALL coriolis( i, j, 3 )
           IF ( ocean )  THEN
-             CALL buoyancy( i, j, rho, prho_reference, 3, 64 )
+             CALL buoyancy( i, j, rho, rho_reference, 3, 64 )
           ELSE
              IF ( .NOT. humidity )  THEN
@@ -1263 +1264 @@
                 IF ( .NOT. humidity )  THEN
                    IF ( ocean )  THEN
-                      CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e, &
-                                        km, l_grid, rho, prho_reference,  &
+                      CALL diffusion_e( i, j, ddzu, dd2zu, ddzw, diss, e,  &
+                                        km, l_grid, prho, prho_reference,  &
                                         rif, tend, zu, zw )
                    ELSE
@@ -1552 +1553 @@
     CALL coriolis( 3 )
     IF ( ocean )  THEN
-       CALL buoyancy( rho, prho_reference, 3, 64 )
+       CALL buoyancy( rho, rho_reference, 3, 64 )
     ELSE
        IF ( .NOT. humidity )  THEN
@@ -1967 +1968 @@
           IF ( .NOT. humidity )  THEN
              IF ( ocean )  THEN
-                CALL diffusion_e( ddzu, dd2zu, ddzw, diss, e, km, l_grid, rho, &
-                                  prho_reference, rif, tend, zu, zw )
+                CALL diffusion_e( ddzu, dd2zu, ddzw, diss, e, km, l_grid, &
+                                  prho, prho_reference, rif, tend, zu, zw )
              ELSE
                 CALL diffusion_e( ddzu, dd2zu, ddzw, diss, e, km, l_grid, pt, &
@@ -2004 +2005 @@
                 IF ( ocean )  THEN
                    CALL diffusion_e( ddzu, dd2zu, ddzw, diss, e, km, l_grid, &
-                                     rho, prho_reference, rif, tend, zu, zw )
+                                     prho, prho_reference, rif, tend, zu, zw )
                 ELSE
                    CALL diffusion_e( ddzu, dd2zu, ddzw, diss, e, km, l_grid, &