Changeset 2031 for palm/trunk/SOURCE/eqn_state_seawater.f90

Timestamp:

Oct 21, 2016 3:11:58 PM (8 years ago)

Author:

knoop

Message:

Renamed variable rho to rho_ocean, rho_init to rho_ocean_init and rho_av to rho_ocean_av

File:

• palm/trunk/SOURCE/eqn_state_seawater.f90 (modified) (7 diffs)

palm/trunk/SOURCE/eqn_state_seawater.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! renamed variable rho to rho_ocean
 ! 
 ! Former revisions:
@@ -115 +115 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  hyp, prho, pt_p, rho, sa_p
+           ONLY:  hyp, prho, pt_p, rho_ocean, sa_p
        USE indices,                                                            &
            ONLY:  nxl, nxr, nyn, nys, nzb_s_inner, nzt
@@ -181 +181 @@
 !
 !--             In-situ density
-                rho(k,j,i) = pnom / pden
+                rho_ocean(k,j,i) = pnom / pden
 
              ENDDO
@@ -188 +188 @@
              prho(nzt+1,j,i)            = prho(nzt,j,i)
              prho(nzb_s_inner(j,i),j,i) = prho(nzb_s_inner(j,i)+1,j,i)
-             rho(nzt+1,j,i)             = rho(nzt,j,i)
-             rho(nzb_s_inner(j,i),j,i)  = rho(nzb_s_inner(j,i)+1,j,i)
+             rho_ocean(nzt+1,j,i)             = rho_ocean(nzt,j,i)
+             rho_ocean(nzb_s_inner(j,i),j,i)  = rho_ocean(nzb_s_inner(j,i)+1,j,i)
 
           ENDDO
@@ -205 +205 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  hyp, prho, pt_p, rho, sa_p
+           ONLY:  hyp, prho, pt_p, rho_ocean, sa_p
            
        USE indices,                                                            &
@@ -255 +255 @@
 !
 !--       In-situ density
-          rho(k,j,i) = pnom / pden
+          rho_ocean(k,j,i) = pnom / pden
 
 
@@ -264 +264 @@
        prho(nzt+1,j,i)            = prho(nzt,j,i)
        prho(nzb_s_inner(j,i),j,i) = prho(nzb_s_inner(j,i)+1,j,i)
-       rho(nzt+1,j,i)             = rho(nzt,j,i)
-       rho(nzb_s_inner(j,i),j,i)  = rho(nzb_s_inner(j,i)+1,j,i)
+       rho_ocean(nzt+1,j,i)             = rho_ocean(nzt,j,i)
+       rho_ocean(nzb_s_inner(j,i),j,i)  = rho_ocean(nzb_s_inner(j,i)+1,j,i)
 
     END SUBROUTINE eqn_state_seawater_ij