Changeset 691
- Timestamp:
- Mar 4, 2011 8:45:30 AM (14 years ago)
- Location:
- palm/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mbuild
r678 r691 117 117 # 14/12/10 - Siggi - adjustments for new Tsubame system at Tokyo 118 118 # institute of technology (lctit) 119 # 04/03/11 - BjörnM- re-adjustments for lcxt4 119 120 120 121 … … 1090 1091 then 1091 1092 1092 print ". /opt/modules/default/init/ksh; $module_calls cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh ${remote_username}@${remote_addres}2>&1 | tee ${remote_host}_last_make_protokoll1093 ssh ${remote_username}@${remote_addres} ". /opt/modules/default/init/ksh; $module_calls cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" 2>&1 | tee ${remote_host}_last_make_protokoll 1093 1094 1094 1095 else … … 1249 1250 then 1250 1251 1251 print ". /opt/modules/default/init/ksh; $module_calls cd ${remote_ud}; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh ${remote_username}@${remote_addres}2>&1 | tee ${remote_host}_last_make_protokoll1252 ssh ${remote_username}@${remote_addres} ". /opt/modules/default/init/ksh; $module_calls cd ${remote_ud}; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" 2>&1 | tee ${remote_host}_last_make_protokoll 1252 1253 1253 1254 else -
palm/trunk/SOURCE/data_output_2d.f90
r674 r691 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! Replaced simulated_time by time_since_reference_point 6 7 ! 7 8 ! Former revisions: … … 727 728 #if defined( __netcdf ) 728 729 IF ( netcdf_output .AND. myid == 0 ) THEN 729 WRITE ( 21 ) simulated_time, &730 WRITE ( 21 ) time_since_reference_point, & 730 731 do2d_xy_time_count(av), av 731 732 ENDIF … … 1023 1024 #if defined( __netcdf ) 1024 1025 IF ( netcdf_output .AND. myid == 0 ) THEN 1025 WRITE ( 22 ) simulated_time, &1026 WRITE ( 22 ) time_since_reference_point, & 1026 1027 do2d_xz_time_count(av), av 1027 1028 ENDIF … … 1324 1325 #if defined( __netcdf ) 1325 1326 IF ( netcdf_output .AND. myid == 0 ) THEN 1326 WRITE ( 23 ) simulated_time, &1327 WRITE ( 23 ) time_since_reference_point, & 1327 1328 do2d_yz_time_count(av), av 1328 1329 ENDIF -
palm/trunk/SOURCE/data_output_3d.f90
r674 r691 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! Replaced simulated_time by time_since_reference_point 6 7 ! 7 8 ! Former revisions: … … 242 243 to_be_resorted => q_av 243 244 ENDIF 244 245 245 246 CASE ( 'ql' ) 246 247 IF ( av == 0 ) THEN … … 291 292 to_be_resorted => rho_av 292 293 ENDIF 293 294 294 295 CASE ( 's' ) 295 296 IF ( av == 0 ) THEN … … 298 299 to_be_resorted => s_av 299 300 ENDIF 300 301 301 302 CASE ( 'sa' ) 302 303 IF ( av == 0 ) THEN … … 305 306 to_be_resorted => sa_av 306 307 ENDIF 307 308 308 309 CASE ( 'u' ) 309 310 IF ( av == 0 ) THEN … … 408 409 !-- combine_plot_fields 409 410 IF ( myid == 0 ) THEN 410 WRITE ( 30 ) simulated_time, do3d_time_count(av), av 411 WRITE ( 30 ) time_since_reference_point, & 412 do3d_time_count(av), av 411 413 ENDIF 412 414 WRITE ( 30 ) nxlg, nxrg, nysg, nyng, nzb, nz_do3d -
palm/trunk/SOURCE/init_coupling.f90
r668 r691 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: combine_plot_fields did not work with data_output_2d_on_each_pe = .T. 7 ! for precursor ocean runs 7 8 ! 8 9 ! Former revisions: … … 96 97 IF ( i == 0 ) THEN 97 98 coupling_mode = 'uncoupled' 99 ! 100 !-- In case of a precursor ocean run, an additional flag file is created. 101 !-- This is necessary for data_output_2d_on_each_pe = .T. 102 IF ( bc_data(3) == 1 ) THEN 103 OPEN( 90, FILE='PRECURSOR_OCEAN', FORM='FORMATTED' ) 104 WRITE ( 90, '(''TRUE'')' ) 105 CLOSE ( 90 ) 106 ENDIF 98 107 ELSE 99 108 comm_inter = MPI_COMM_WORLD -
palm/trunk/UTIL/combine_plot_fields.f90
r494 r691 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: check for precursor ocean runs 7 7 ! 8 8 ! Former revisions: … … 116 116 117 117 ! 118 !-- Find out if a precursor ocean run has been carried out 119 INQUIRE( FILE='PRECURSOR_OCEAN', EXIST=found ) 120 IF ( found ) THEN 121 model_string = '_O' 122 PRINT*, ' precursor ocean run' 123 ELSE 124 model_string = '' 125 ENDIF 126 127 ! 118 128 !-- Do everything for each model 119 129 DO model = 1, models 120 130 ! 121 131 !-- Set the model string used to identify the filenames 122 model_string = ''123 132 IF ( models == 2 ) THEN 124 133 PRINT*, ''
Note: See TracChangeset
for help on using the changeset viewer.