Changeset 1764 for palm/trunk/SOURCE/check_parameters.f90

Timestamp:

Feb 28, 2016 12:45:19 PM (8 years ago)

Author:

raasch

Message:

update of the nested domain system + some bugfixes

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! output of nest id in run description header,
+! bugfix: check of validity of lateral boundary conditions moved to parin
 ! 
 ! Former revisions:
@@ -312 +313 @@
     USE pegrid
     USE plant_canopy_model_mod
+    USE pmc_interface,                                                         &
+        ONLY:  cpl_id, nested_run
     USE profil_parameter
     USE radiation_model_mod
@@ -328 +331 @@
     CHARACTER (LEN=8)   ::  date                     !< 
     CHARACTER (LEN=10)  ::  time                     !< 
+    CHARACTER (LEN=10)  ::  ensemble_string          !<
+    CHARACTER (LEN=15)  ::  nest_string              !<
     CHARACTER (LEN=40)  ::  coupling_string          !< 
     CHARACTER (LEN=100) ::  action                   !< 
@@ -583 +588 @@
     ELSEIF ( coupling_mode == 'ocean_to_atmosphere' )  THEN
        coupling_string = ' coupled (ocean)'
-    ENDIF       
-
+    ENDIF
     IF ( ensemble_member_nr /= 0 )  THEN
-       WRITE ( run_description_header,                                         &
-                  '(A,2X,A,2X,A,A,A,I2.2,A,2X,A,I2.2,2X,A,A,2X,A,1X,A)' )      &
-              TRIM( version ), TRIM( revision ), 'run: ',                      &
-              TRIM( run_identifier ), '.', runnr, TRIM( coupling_string ),     &
-              'en-no: ', ensemble_member_nr,'host: ', TRIM( host ),            &
-              run_date, run_time
+       WRITE( ensemble_string, '(2X,A,I2.2)' )  'en-no: ', ensemble_member_nr
     ELSE
-       WRITE ( run_description_header,                                         &
-                  '(A,2X,A,2X,A,A,A,I2.2,A,2X,A,A,2X,A,1X,A)' )                &
-              TRIM( version ), TRIM( revision ), 'run: ',                      &
-              TRIM( run_identifier ), '.', runnr, TRIM( coupling_string ),     &
-              'host: ', TRIM( host ), run_date, run_time
-    ENDIF
+       ensemble_string = ''
+    ENDIF
+    IF ( nested_run )  THEN
+       WRITE( nest_string, '(2X,A,I2.2)' )  'nest-id: ', cpl_id
+    ELSE
+       nest_string = ''
+    ENDIF
+
+    WRITE ( run_description_header,                                            &
+            '(A,2X,A,2X,A,A,A,I2.2,A,A,A,2X,A,A,2X,A,1X,A)' )                  &
+          TRIM( version ), TRIM( revision ), 'run: ',                          &
+          TRIM( run_identifier ), '.', runnr, TRIM( coupling_string ),         &
+          TRIM( nest_string ), TRIM( ensemble_string), 'host: ', TRIM( host ), &
+          run_date, run_time
+
 !
 !-- Check the general loop optimization method
@@ -1756 +1764 @@
 !
 !-- Check boundary conditions and set internal variables:
-!-- Lateral boundary conditions
-    IF ( bc_lr /= 'cyclic'  .AND.  bc_lr /= 'dirichlet/radiation'  .AND. &
-         bc_lr /= 'radiation/dirichlet'  .AND.  bc_lr /= 'nested' )  THEN
-       message_string = 'unknown boundary condition: bc_lr = "' // &
-                        TRIM( bc_lr ) // '"'
-       CALL message( 'check_parameters', 'PA0049', 1, 2, 0, 6, 0 )
-    ENDIF
-    IF ( bc_ns /= 'cyclic'  .AND.  bc_ns /= 'dirichlet/radiation'  .AND. &
-         bc_ns /= 'radiation/dirichlet'  .AND.  bc_ns /= 'nested' )  THEN
-       message_string = 'unknown boundary condition: bc_ns = "' // &
-                        TRIM( bc_ns ) // '"'
-       CALL message( 'check_parameters', 'PA0050', 1, 2, 0, 6, 0 )
-    ENDIF
-
-!
-!-- Internal variables used for speed optimization in if clauses
-    IF ( bc_lr /= 'cyclic' )               bc_lr_cyc    = .FALSE.
-    IF ( bc_lr == 'dirichlet/radiation' )  bc_lr_dirrad = .TRUE.
-    IF ( bc_lr == 'radiation/dirichlet' )  bc_lr_raddir = .TRUE.
-    IF ( bc_ns /= 'cyclic' )               bc_ns_cyc    = .FALSE.
-    IF ( bc_ns == 'dirichlet/radiation' )  bc_ns_dirrad = .TRUE.
-    IF ( bc_ns == 'radiation/dirichlet' )  bc_ns_raddir = .TRUE.
-
+!-- Attention: the lateral boundary conditions have been already checked in
+!-- parin
 !
 !-- Non-cyclic lateral boundaries require the multigrid method and Piascek-