Changeset 931 for palm/trunk/SOURCE

Timestamp:

Jun 8, 2012 3:09:28 PM (12 years ago)

Author:

maronga

Message:

enabled check of max_pr_user in namelist file check; disabled sleep command in mrun in silent mode (-v)

Location:

palm/trunk/SOURCE

Files:

• check_namelist_files.f90 (modified) (3 diffs)
• user_parin.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_namelist_files.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Check of max_pr_user implemented
 !
 ! Former revisions:
@@ -33 +33 @@
 
 !
-!-- Read number of processors and variable check_restart, which gives 
-!-- information whether the p3d or the pd3f file shall be checked
-    READ (*,*,ERR=10,END=10)  numprocs, check_restart
+!-- Read number of processors, the variable check_restart and max_user_pr. 
+!-- check_restart gives information whether the initalor the restart parameter
+!-- file must be checked. max_user_pr is usually set by read_var_list
+!-- (excluded in the namelist file check).
+    READ (*,*,ERR=10,END=10)  numprocs, check_restart, max_pr_user
 10  CONTINUE
 
@@ -43 +45 @@
     CALL parin
 
+    OPEN( 11, FILE='parin_for_check', FORM='FORMATTED' )
+    WRITE(11, FMT='(I)'), max_pr_user
+    CLOSE(11)
 !
-!-- Determine processor topology and local array indices
+!-- Determine processor topology and local array indicesy
+
     CALL init_pegrid
 

palm/trunk/SOURCE/user_parin.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Re-enabled check for max_pr_user
 !
 ! Former revisions:
@@ -86 +86 @@
 !-- restart file (already stored in max_pr_user) has to match the one given
 !-- for the current run
-#if ! defined ( __check )
     IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
        IF ( max_pr_user /= max_pr_user_tmp )  THEN
@@ -99 +98 @@
        max_pr_user = max_pr_user_tmp
     ENDIF
-#endif
 
 100 RETURN