Changeset 3779 for palm/trunk/UTIL/inifor/src/inifor_io.f90

Timestamp:

Mar 5, 2019 11:13:35 AM (5 years ago)

Author:

eckhard

Message:

inifor: bugfix: Fixes issue #815 with geostrophic wind profiles

File:

• palm/trunk/UTIL/inifor/src/inifor_io.f90 (modified) (6 diffs)

palm/trunk/UTIL/inifor/src/inifor_io.f90

@@ -15 +15 @@
 ! PALM. If not, see <http://www.gnu.org/licenses/>.
 !
-! Copyright 2017-2018 Leibniz Universitaet Hannover
-! Copyright 2017-2018 Deutscher Wetterdienst Offenbach
+! Copyright 2017-2019 Leibniz Universitaet Hannover
+! Copyright 2017-2019 Deutscher Wetterdienst Offenbach
 !------------------------------------------------------------------------------!
 !
@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Temporariliy disabled height-based geostrophic wind averaging
+! Improved variable naming
+! 
+! 
+! 3764 2019-02-26 13:42:09Z eckhard
 ! Removed dependency on radiation input files
 ! 
@@ -397 +402 @@
 
        cfg % p0_is_set = .FALSE.
-       cfg % ug_is_set = .FALSE.
-       cfg % vg_is_set = .FALSE.
+       cfg % ug_defined_by_user = .FALSE.
+       cfg % vg_defined_by_user = .FALSE.
        cfg % flow_prefix_is_set = .FALSE.
        cfg % input_prefix_is_set = .FALSE.
@@ -442 +447 @@
 
              CASE( '-ug', '-u', '--geostrophic-u' )
-                cfg % ug_is_set = .TRUE.
+                cfg % ug_defined_by_user = .TRUE.
                 CALL get_option_argument( i, arg )
                 READ(arg, *) cfg % ug
 
              CASE( '-vg', '-v', '--geostrophic-v' )
-                cfg % vg_is_set = .TRUE.
+                cfg % vg_defined_by_user = .TRUE.
                 CALL get_option_argument( i, arg )
                 READ(arg, *) cfg % vg
@@ -712 +717 @@
 
       SELECT CASE( TRIM(cfg % averaging_mode) )
-      CASE( 'level', 'height')
+      CASE( 'level' )
+      CASE( 'height' )
+         message = "Averaging mode '" // TRIM(cfg % averaging_mode) //&
+                   "' is currently not supported. " //&
+                   "Please use level-based averaging by selecting 'level', " //&
+                   "or by omitting the --averaging-mode option entirely."
+         CALL inifor_abort( 'validate_config', message )
       CASE DEFAULT
          message = "Averaging mode '" // TRIM(cfg % averaging_mode) //&
                    "' is not supported. " //&
-                   "Please select either 'height' or 'level', " //&
-                   "or omit the --averaging-mode option entirely, which corresponds "//&
-                   "to the latter."
+         !          "Please select either 'height' or 'level', " //&
+         !          "or omit the --averaging-mode option entirely, which corresponds "//&
+         !          "to the latter."
+                   "Please use level-based averaging by selecting 'level', " //&
+                   "or by omitting the --averaging-mode option entirely."
          CALL inifor_abort( 'validate_config', message )
       END SELECT
 
-      IF ( cfg % ug_is_set .NEQV. cfg % vg_is_set )  THEN
+      IF ( cfg % ug_defined_by_user .NEQV. cfg % vg_defined_by_user )  THEN
          message = "You specified only one component of the geostrophic " // &
                    "wind. Please specify either both or none."
@@ -965 +978 @@
           var => output_variable_table(i)
 
-          to_be_written = ( var % to_be_processed  .AND. .NOT. var % is_internal) .OR.                        &
-                          ( var % is_internal  .AND.  debug )
+          !to_be_written = ( var % to_be_processed  .AND. .NOT. var % is_internal) .OR. &
+          !                ( var % is_internal  .AND.  debug )
+          to_be_written = ( var % to_be_processed  .AND. .NOT. var % is_internal)
 
           IF ( to_be_written )  THEN