Changeset 811


Ignore:
Timestamp:
Jan 31, 2012 9:45:54 AM (10 years ago)
Author:
maronga
Message:

bugfix in mbuild (utility compilation), bugfix in mrungui

Location:
palm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r807 r811  
    126126     #                    check program) has been added to the utility branch),
    127127     #                    modfified the compilation of mrungui
     128     # 31/01/12 - BjornM- bugfix for compilation of utility programs on
     129     #                    multiple localhost branches
    128130
    129131
     
    138140 makefile=""
    139141 module_calls=""
     142 util_compiled_localhost=false
    140143 scirocco=false
    141144 silent=false
     
    424427    tar -cf  ${mainprog}_sources_check.tar  Makefile_check  $line
    425428    printf "\n"
    426 
    427429 fi
    428430
     
    13901392
    13911393             # CHECK IF QMAKE IS AVAILABLE AND COMPILE MRUNGUI
    1392           printf "\n\n"
    1393           echo "  *** compiling the mrun GUI"
    1394           if which qmake >/dev/null; then
    1395              cd mrungui
    1396              touch *
    1397              qmake
    1398              make
    1399              make clean
    1400              rm Makefile
    1401              cd ..
    1402           else
    1403              echo "  +++ no qmake found. The (optional) GUI will not be compiled."
    1404           fi
    1405 
    1406              # COMPILE CHECK_NAMELIST_FILES
    1407           printf "\n\n"
    1408           echo "  *** compiling check_namelist_files ..."
    1409 
    1410           check_depository_path=${local_source_path}/../UTIL
    1411           cd $check_depository_path
    1412           mkdir check_tmp
    1413           mv ${local_source_path}/${mainprog}_sources_check.tar ./check_tmp
    1414           cd check_tmp
    1415           tar -xf  ${mainprog}_sources_check.tar
    1416           rm -rf ${mainprog}_sources_check.tar
    1417 
    1418           copts_check="-cpp -D_parallel -D__check"
    1419           make  -f Makefile_check $make_options F90=$compiler_name_ser  COPT="$copts_check"
    1420 
    1421           tar -cf  check_namelist_files.tar Makefile_check check_namelist_files.x *.f90 *.o *.mod
    1422           mv check_namelist_files.tar $check_depository_path
    1423           mv check_namelist_files.x $PALM_BIN
    1424           cd $check_depository_path
    1425           rm -rf check_tmp
     1394          if [[ $util_compiled_localhost == false ]]
     1395          then
     1396             printf "\n\n"
     1397             echo "  *** compiling the mrun GUI"
     1398             if which qmake >/dev/null; then
     1399                cd mrungui
     1400                touch *
     1401                qmake
     1402                make
     1403                make clean
     1404                rm Makefile
     1405                cd ..
     1406             else
     1407                echo "  +++ no qmake found. The (optional) GUI will not be compiled."
     1408             fi
     1409
     1410             # COMPILE CHECK_NAMELIST_FILES (ONLY FOR ONE BRANCH on LOCALHOST NEEDED)
     1411
     1412             printf "\n\n"
     1413             echo "  *** compiling check_namelist_files ..."
     1414
     1415             check_depository_path=${local_source_path}/../UTIL
     1416             cd $check_depository_path
     1417             mkdir check_tmp
     1418             cp ${local_source_path}/${mainprog}_sources_check.tar ./check_tmp
     1419             cd check_tmp
     1420             tar -xf  ${mainprog}_sources_check.tar
     1421             rm -rf ${mainprog}_sources_check.tar
     1422
     1423             copts_check="-cpp -D_parallel -D__check"
     1424             make  -f Makefile_check $make_options F90=$compiler_name_ser  COPT="$copts_check"
     1425
     1426             tar -cf  check_namelist_files.tar Makefile_check check_namelist_files.x *.f90 *.o *.mod
     1427             mv check_namelist_files.tar $check_depository_path
     1428             mv check_namelist_files.x $PALM_BIN
     1429             cd $check_depository_path
     1430             rm -rf check_tmp
     1431             util_compiled_localhost=true
     1432          else
     1433             cd $check_depository_path
     1434             printf "\n\n"
     1435             echo "  *** skipped compilation of mrun GUI (already."       
     1436             printf "\n\n"
     1437             echo "  *** skipped compilation of check_namelist_files."           
     1438          fi
    14261439
    14271440       fi
     
    14451458    # FINAL WORK
    14461459 rm -f  hosts_found_in_config_file
    1447 
     1460 rm -f ${local_source_path}/${mainprog}_sources_check.tar
     1461
  • palm/trunk/UTIL/mrungui/mainwindow.cpp

    r810 r811  
    22// Current revisions:
    33// -----------------
     4// Bugfix: waitForFinished time exceeded limits, adjusted to 1h waiting time
    45//
    56// Former revisions:
     
    224225//        xtermoutput = xtermoutput+mrun.readAllStandardOutput();
    225226
    226 //  Wait until mrun has finished or wait for 2000 minutes
    227     mrun.waitForFinished(12000000000);
     227//  Wait until mrun has finished or wait for 200 minutes
     228    mrun.waitForFinished(3600000);
    228229
    229230
Note: See TracChangeset for help on using the changeset viewer.