Changeset 3045 for palm/trunk/SOURCE/parin.f90

Timestamp:

May 28, 2018 7:55:41 AM (6 years ago)

Author:

Giersch

Message:

Code adjusted according to coding standards, renamed namelists, error messages revised until PA0347, output CASE 108 disabled

File:

• palm/trunk/SOURCE/parin.f90 (modified) (8 diffs)

palm/trunk/SOURCE/parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! z_max_do2d removed, error messages revised
+! 
+! 2995 2018-04-19 12:13:16Z Giersch
 ! time_since_reference_point must be calculated/initialized before the first  
 ! call of functions related to the radiation model which occur in 
@@ -639 +642 @@
              skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,          &
              skip_time_do3d, skip_time_domask, synchronous_exchange,           &
-             termination_time_needed, vnest_start_time, z_max_do2d
+             termination_time_needed, vnest_start_time
 
     NAMELIST /runtime_parameters/  averaging_interval, averaging_interval_pr,  &
@@ -660 +663 @@
              skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,          &
              skip_time_do3d, skip_time_domask, synchronous_exchange,           &
-             termination_time_needed, vnest_start_time, z_max_do2d
+             termination_time_needed, vnest_start_time
 
     NAMELIST /envpar/  batch_job, host, local_dvrserver_running,               &
@@ -669 +672 @@
 !
 !-- First read values of environment variables (this NAMELIST file is
-!-- generated by mrun)
+!-- generated by palmrun)
     CALL location_message( 'reading environment parameters from ENVPAR', .FALSE. )
 
@@ -676 +679 @@
     IF ( ioerr /= 0 )  THEN
        message_string = 'local file ENVPAR not found' //                       &
-                        '&some variables for steering may not be properly set'
+                        ' some variables for steering may not be properly set'
        CALL message( 'parin', 'PA0276', 0, 1, 0, 6, 0 )
     ELSE
@@ -682 +685 @@
        IF ( ioerr < 0 )  THEN
           message_string = 'no envpar-NAMELIST found in local file '  //       &
-                           'ENVPAR&some variables for steering may '  //       &
+                           'ENVPAR or some variables for steering may '  //    &
                            'not be properly set'
           CALL message( 'parin', 'PA0278', 0, 1, 0, 6, 0 )
        ELSEIF ( ioerr > 0 )  THEN
           message_string = 'errors in local file ENVPAR' //                    &
-                           '&some variables for steering may not be properly set'
+                           ' some variables for steering may not be properly set'
           CALL message( 'parin', 'PA0277', 0, 1, 0, 6, 0 )
        ENDIF
@@ -742 +745 @@
           GOTO 12
 
- 10       message_string = 'errors in initialization_parameters &or no ' //    &
-                           'initialization_parameters-namelist ' //            &
+ 10       message_string = 'errors in &initialization_parameters or no ' //    &
+                           '&initialization_parameters-namelist ' //           &
                            'found (CRAY-machines only)'
           CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
@@ -750 +753 @@
           READ ( 11, inipar, ERR=13, END=14 )
  
-          message_string = 'namelist inipar is deprecated and will be ' //     &
-                          'removed in near future. Please &use namelist ' //   &
-                          'initialization_parameters instead'
-          CALL message( 'parin', 'PA0272', 0, 1, 0, 6, 0 )
+          message_string = 'namelist &inipar is deprecated and will be ' //    &
+                          'removed in near future. Please use namelist ' //    &
+                          '&initialization_parameters instead'
+          CALL message( 'parin', 'PA0017', 0, 1, 0, 6, 0 )
  
           GOTO 12
  
- 13       message_string = 'errors in inipar &or no inipar-namelist ' //       &
+ 13       message_string = 'errors in inipar  or no inipar-namelist ' //       &
                            'found (CRAY-machines only)'
           CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
           
- 14       message_string = 'no initialization_parameters-namelist found'
+ 14       message_string = 'no &initialization_parameters-namelist found'
           CALL message( 'parin', 'PA0272', 1, 2, 0, 6, 0 )