Changeset 3668 for palm/trunk/SOURCE/land_surface_model_mod.f90

Timestamp:

Jan 14, 2019 12:49:24 PM (6 years ago)

Author:

maronga

Message:

removed most_methods circular and lookup. added improved version of palm_csd

File:

• palm/trunk/SOURCE/land_surface_model_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Removed most_method
+! 
+! 3655 2019-01-07 16:51:22Z knoop
 ! nopointer option removed
 ! 
@@ -1324 +1327 @@
 
     USE control_parameters,                                                    &
-        ONLY:  bc_pt_b, bc_q_b, constant_flux_layer, message_string,           &
-               most_method
+        ONLY:  bc_pt_b, bc_q_b, constant_flux_layer, message_string
                      
     
@@ -1446 +1448 @@
     
     IF ( TRIM( surface_type ) == 'water' )  THEN
-
-       IF ( TRIM( most_method ) == 'lookup' )  THEN    
-          WRITE( message_string, * ) 'surface_type = ', surface_type,          &
-                                     ' is not allowed in combination with ',   &
-                                     'most_method = ', most_method
-          CALL message( 'lsm_check_parameters', 'PA0414', 1, 2, 0, 6, 0 )
-       ENDIF
 
        IF ( water_type == 0 )  THEN  
@@ -1531 +1526 @@
 
     IF ( TRIM( surface_type ) == 'netcdf' )  THEN
-       IF ( ANY( water_type_f%var /= water_type_f%fill )  .AND.                &
-            TRIM( most_method ) == 'lookup' )  THEN    
-          WRITE( message_string, * ) 'water-surfaces are not allowed in ' //   &
-                                     'combination with most_method = ',        &
-                                     TRIM( most_method )
-          CALL message( 'lsm_check_parameters', 'PA0999', 2, 2, 0, 6, 0 )
-       ENDIF
 !
 !--    MS: Some problme here, after calling message everythings stucks at