Changeset 2932 for palm/trunk/SOURCE/user_parin.f90

Timestamp:

Mar 26, 2018 9:39:22 AM (6 years ago)

Author:

maronga

Message:

renamed all Fortran NAMELISTS

File:

• palm/trunk/SOURCE/user_parin.f90 (modified) (5 diffs)

palm/trunk/SOURCE/user_parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! renamed userpar to user_parameters
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -96 +99 @@
     IMPLICIT NONE
 
-    CHARACTER (LEN=80) ::  zeile   !< 
+    CHARACTER (LEN=80) ::  line   !< 
 
     INTEGER(iwp) ::  i                 !< 
@@ -104 +107 @@
 
     NAMELIST /userpar/  data_output_pr_user, data_output_user, region,         &
+                        data_output_masks_user
+                        
+                        
+    NAMELIST /user_parameters/  data_output_pr_user, data_output_user, region, &
                         data_output_masks_user
 
@@ -119 +126 @@
     REWIND ( 11 )
 
-    zeile = ' '
-    DO   WHILE ( INDEX( zeile, '&userpar' ) == 0 )
-       READ ( 11, '(A)', END=100 )  zeile
+    line = ' '
+    DO   WHILE ( INDEX( line, '&user_parameters' ) == 0 )
+       READ ( 11, '(A)', END=10 )  line
     ENDDO
     BACKSPACE ( 11 )
@@ -128 +135 @@
 !-- Read user-defined namelist
     READ ( 11, userpar )
+
     user_defined_namelist_found = .TRUE.
+
+    GOTO 12
+    
+    
+10  REWIND ( 11 )
+
+    line = ' ' 
+    DO   WHILE ( INDEX( line, '&userpar' ) == 0 )
+       READ ( 11, '(A)', END=12 )  line
+    ENDDO
+    BACKSPACE ( 11 )
+
+!
+!-- Read user-defined namelist
+    READ ( 11, userpar )
+    
+    
+    message_string = 'namelist userpar is deprecated and will be ' //          &
+                     'removed in near future. Please &use namelist ' //        &
+                     'user_parameters instead' 
+    CALL message( 'user_parin', 'PA0487', 0, 1, 0, 6, 0 )
+       
+    user_defined_namelist_found = .TRUE.
+    
+    
+ 12 CONTINUE
 
 !
 !-- Determine the number of user-defined profiles and append them to the
 !-- standard data output (data_output_pr)
-    max_pr_user_tmp = 0
-    IF ( data_output_pr_user(1) /= ' ' )  THEN
-       i = 1
-       DO  WHILE ( data_output_pr(i) /= ' '  .AND.  i <= 100 )
-          i = i + 1
-       ENDDO
-       j = 1
-       DO  WHILE ( data_output_pr_user(j) /= ' '  .AND.  j <= 100 )
-          data_output_pr(i) = data_output_pr_user(j)
-          max_pr_user_tmp   = max_pr_user_tmp + 1
-          i = i + 1
-          j = j + 1
-       ENDDO
-    ENDIF
-
-!
-!-- In case of a restart run, the number of user-defined profiles on the
-!-- restart file (already stored in max_pr_user) has to match the one given
-!-- for the current run
-    IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
-       IF ( max_pr_user /= max_pr_user_tmp )  THEN
-          WRITE( message_string, * ) 'the number of user-defined profiles ',   &
+    IF ( user_defined_namelist_found )  THEN
+       max_pr_user_tmp = 0
+       IF ( data_output_pr_user(1) /= ' ' )  THEN
+          i = 1
+          DO  WHILE ( data_output_pr(i) /= ' '  .AND.  i <= 100 )
+             i = i + 1
+          ENDDO
+          j = 1
+          DO  WHILE ( data_output_pr_user(j) /= ' '  .AND.  j <= 100 )
+             data_output_pr(i) = data_output_pr_user(j)
+             max_pr_user_tmp   = max_pr_user_tmp + 1
+             i = i + 1
+             j = j + 1
+          ENDDO
+      ENDIF
+
+
+!
+!--    In case of a restart run, the number of user-defined profiles on the
+!--    restart file (already stored in max_pr_user) has to match the one given
+!--    for the current run
+       IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
+          IF ( max_pr_user /= max_pr_user_tmp )  THEN
+             WRITE( message_string, * ) 'the number of user-defined profiles ',&
                      'given in &data_output_pr (', max_pr_user_tmp, ') doe',   &
                      'snot match the one ',                                    &
                      '&found in the restart file (', max_pr_user,              &
                                      ')'
-          CALL message( 'user_parin', 'UI0009', 1, 2, 0, 6, 0 )
+             CALL message( 'user_parin', 'UI0009', 1, 2, 0, 6, 0 )
+          ENDIF
+       ELSE
+          max_pr_user = max_pr_user_tmp
        ENDIF
-    ELSE
-       max_pr_user = max_pr_user_tmp
+
     ENDIF
-
-100 RETURN
+ 
+    RETURN
 
  END SUBROUTINE user_parin