Changeset 3294 for palm/trunk/SOURCE/surface_mod.f90

Timestamp:

Oct 1, 2018 2:37:10 AM (6 years ago)

Author:

raasch

Message:

modularization of the ocean code

File:

• palm/trunk/SOURCE/surface_mod.f90 (modified) (10 diffs)

palm/trunk/SOURCE/surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! changes concerning modularization of ocean option
+! 
+! 3274 2018-09-24 15:42:55Z knoop
 ! Modularization of all bulk cloud physics code components
 ! 
@@ -1114 +1117 @@
 !
 !--    Salinity surface flux
-       IF ( ocean )  DEALLOCATE ( surfaces%sasws )
+       IF ( ocean_mode )  DEALLOCATE ( surfaces%sasws )
 
     END SUBROUTINE deallocate_surface_attributes_h
@@ -1241 +1244 @@
 !
 !--    Salinity surface flux
-       IF ( ocean )  ALLOCATE ( surfaces%sasws(1:surfaces%ns) )
+       IF ( ocean_mode )  ALLOCATE ( surfaces%sasws(1:surfaces%ns) )
 
     END SUBROUTINE allocate_surface_attributes_h
@@ -1306 +1309 @@
 !
 !--    Salinity flux
-       IF ( ocean )  DEALLOCATE ( surfaces%sasws )
+       IF ( ocean_mode )  DEALLOCATE ( surfaces%sasws )
 
     END SUBROUTINE deallocate_surface_attributes_h_top
@@ -1378 +1381 @@
 !
 !--    Salinity flux
-       IF ( ocean )  ALLOCATE ( surfaces%sasws(1:surfaces%ns) )
+       IF ( ocean_mode )  ALLOCATE ( surfaces%sasws(1:surfaces%ns) )
 
     END SUBROUTINE allocate_surface_attributes_h_top
@@ -1496 +1499 @@
 !
 !--    Salinity surface flux
-       IF ( ocean )  DEALLOCATE ( surfaces%sasws )
+       IF ( ocean_mode )  DEALLOCATE ( surfaces%sasws )
 
     END SUBROUTINE deallocate_surface_attributes_v
@@ -1621 +1624 @@
 !
 !--    Salinity surface flux
-       IF ( ocean )  ALLOCATE ( surfaces%sasws(1:surfaces%ns) )
+       IF ( ocean_mode )  ALLOCATE ( surfaces%sasws(1:surfaces%ns) )
 
     END SUBROUTINE allocate_surface_attributes_v
@@ -2268 +2271 @@
                 ENDIF
 
-                IF ( ocean )  THEN
+                IF ( ocean_mode )  THEN
                    IF ( upward_facing )  THEN 
                       surf%sasws(num_h) = bottom_salinityflux * rho_air_zw(k-1)
@@ -2344 +2347 @@
 !
 !--          Prescribe top salinity flux
-             IF ( ocean .AND. constant_top_salinityflux)                       &
+             IF ( ocean_mode .AND. constant_top_salinityflux)                  &
                 surf%sasws(num_h) = top_salinityflux * rho_air_zw(nzt+1)
 !
@@ -2488 +2491 @@
 !--          So far, salinityflux at vertical surfaces is simply zero 
 !--          at the moment  
-             IF ( ocean )  surf%sasws(num_v) = wall_salinityflux(component)
+             IF ( ocean_mode )  surf%sasws(num_v) = wall_salinityflux(component)
 !
 !--          Increment wall indices