Changeset 17 for palm

Timestamp:

Feb 19, 2007 1:57:39 AM (18 years ago)

Author:

raasch

Message:

setting neck defaults in .mrun.config.default, DVRP_OUTPUT_LOCAL activated for all streams

Location:

palm/trunk

Files:

• SCRIPTS/.mrun.config.default (modified) (2 diffs)
• SOURCE/init_dvrp.f90 (modified) (3 diffs)

palm/trunk/SCRIPTS/.mrun.config.default

@@ -3 +3 @@
 #----------------------------------------------------------------------------
 %mainprog          palm.f90
-%base_directory    $HOME/palm/current_version
-%base_data         palm/current_version/JOBS
-%source_path       $base_directory/SOURCE
+#%base_directory    $HOME/palm/current_version
+#%base_data         palm/current_version/JOBS
+#%source_path       $base_directory/SOURCE
 %add_source_path   $base_directory/USER_CODE/$fname
 %depository_path   $base_directory/MAKE_DEPOSITORY
@@ -95 +95 @@
 %remote_username   b323011                                    nech parallel
 %email_notification  raasch@muk.uni-hannover.de               nech parallel
+#
+%compiler_name     sxmpif90                                   neck parallel
+%fopts             -C:hopt:-Wf:\'-init:stack=nan:-init:heap=nan:-A:idbl4:-pvctl:fullmsg\':-ftrace:-P:stack:-pi:auto:-pi:line=1000  neck parallel
+%lopts             -C:hopt:-Wf:\'-init:stack=nan:-init:heap=nan:-A:idbl4\':-ftrace:-P:stack:-pi:auto:-pi:line=1000:-L/SX/opt/MathKeisan/MK1_6/lib/:-l:fft  neck parallel
+%memory            4000                                       neck parallel
+%cpumax            1000                                       neck parallel
+%numprocs          4                                          neck parallel
+#%tmp_user_catalog  <replace by your temporary directory>      neck parallel
+#%tmp_data_catalog  <replace by your temp. dir.> /palm_restart_data   neck parallel
+#%remote_username   <replace by your NEC-username>             neck parallel
+#%email_notification  tatuyama@gelgoog                         neck parallel
 #
 %remote_username   raasch                                     decalpha parallel

palm/trunk/SOURCE/init_dvrp.f90

@@ -11 +11 @@
 ! -----------------
 ! $Id$
+! dvrp_output_local activated for all streams
+!
+! 13 2007-02-14 12:15:07Z raasch
 ! RCS Log replace by Id keyword, revision history cleaned up
 !
@@ -223 +226 @@
     CALL FLUSH( 9 )
 #endif
+
+          ELSEIF ( dvrp_output == 'ftp' )  THEN
+
+             dvrp_file   = TRIM( mode_dvrp(m) ) // '.buildings.dvr'
+             dvrp_file_c = dvrp_file
+!             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
+!                                   dvrp_password_c, dvrp_directory_c,    &
+!                                   dvrp_file_c )
+
+          ELSE
+
+             IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
+                dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.buildings.dvr'
+                dvrp_file_local_c = dvrp_file_local
+             ELSE
+                dvrp_file_local_c = dvrp_file_c
+             ENDIF
+             CALL DVRP_OUTPUT_LOCAL( m-1, 0, dvrp_file_local_c )
 
           ENDIF
@@ -326 +347 @@
     CALL FLUSH( 9 )
 #endif
+
+          ELSEIF ( dvrp_output == 'ftp' )  THEN
+
+             dvrp_file   = TRIM( mode_dvrp(m) ) // '.surface.dvr'
+             dvrp_file_c = dvrp_file
+!             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
+!                                   dvrp_password_c, dvrp_directory_c,    &
+!                                   dvrp_file_c )
+
+          ELSE
+
+             IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
+                dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.surface.dvr'
+                dvrp_file_local_c = dvrp_file_local
+             ELSE
+                dvrp_file_local_c = dvrp_file_c
+             ENDIF
+             CALL DVRP_OUTPUT_LOCAL( m-1, 0, dvrp_file_local_c )
 
           ENDIF