Changeset 811 for palm

Timestamp:

Jan 31, 2012 9:45:54 AM (12 years ago)

Author:

maronga

Message:

bugfix in mbuild (utility compilation), bugfix in mrungui

Location:

palm/trunk

Files:

• SCRIPTS/mbuild (modified) (5 diffs)
• UTIL/mrungui/mainwindow.cpp (modified) (2 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -126 +126 @@
      #                    check program) has been added to the utility branch),
      #                    modfified the compilation of mrungui
+     # 31/01/12 - BjornM- bugfix for compilation of utility programs on 
+     #                    multiple localhost branches
 
 
@@ -138 +140 @@
  makefile=""
  module_calls=""
+ util_compiled_localhost=false
  scirocco=false
  silent=false
@@ -424 +427 @@
     tar -cf  ${mainprog}_sources_check.tar  Makefile_check  $line
     printf "\n"
-
  fi
 
@@ -1390 +1392 @@
 
              # CHECK IF QMAKE IS AVAILABLE AND COMPILE MRUNGUI
-          printf "\n\n"
-          echo "  *** compiling the mrun GUI"
-          if which qmake >/dev/null; then
-             cd mrungui
-             touch *
-             qmake
-             make
-             make clean
-             rm Makefile
-             cd ..
-          else
-             echo "  +++ no qmake found. The (optional) GUI will not be compiled."
-          fi
-
-             # COMPILE CHECK_NAMELIST_FILES
-          printf "\n\n"
-          echo "  *** compiling check_namelist_files ..."
-
-          check_depository_path=${local_source_path}/../UTIL
-          cd $check_depository_path
-          mkdir check_tmp
-          mv ${local_source_path}/${mainprog}_sources_check.tar ./check_tmp
-          cd check_tmp
-          tar -xf  ${mainprog}_sources_check.tar
-          rm -rf ${mainprog}_sources_check.tar
-
-          copts_check="-cpp -D_parallel -D__check"
-          make  -f Makefile_check $make_options F90=$compiler_name_ser  COPT="$copts_check"
-
-          tar -cf  check_namelist_files.tar Makefile_check check_namelist_files.x *.f90 *.o *.mod
-          mv check_namelist_files.tar $check_depository_path
-          mv check_namelist_files.x $PALM_BIN
-          cd $check_depository_path
-          rm -rf check_tmp
+          if [[ $util_compiled_localhost == false ]]
+          then
+             printf "\n\n"
+             echo "  *** compiling the mrun GUI"
+             if which qmake >/dev/null; then
+                cd mrungui
+                touch *
+                qmake
+                make
+                make clean
+                rm Makefile
+                cd ..
+             else
+                echo "  +++ no qmake found. The (optional) GUI will not be compiled."
+             fi
+
+             # COMPILE CHECK_NAMELIST_FILES (ONLY FOR ONE BRANCH on LOCALHOST NEEDED)
+
+             printf "\n\n"
+             echo "  *** compiling check_namelist_files ..."
+
+             check_depository_path=${local_source_path}/../UTIL
+             cd $check_depository_path
+             mkdir check_tmp
+             cp ${local_source_path}/${mainprog}_sources_check.tar ./check_tmp
+             cd check_tmp
+             tar -xf  ${mainprog}_sources_check.tar
+             rm -rf ${mainprog}_sources_check.tar
+
+             copts_check="-cpp -D_parallel -D__check"
+             make  -f Makefile_check $make_options F90=$compiler_name_ser  COPT="$copts_check"
+
+             tar -cf  check_namelist_files.tar Makefile_check check_namelist_files.x *.f90 *.o *.mod
+             mv check_namelist_files.tar $check_depository_path
+             mv check_namelist_files.x $PALM_BIN
+             cd $check_depository_path
+             rm -rf check_tmp
+             util_compiled_localhost=true
+          else
+             cd $check_depository_path
+             printf "\n\n"
+             echo "  *** skipped compilation of mrun GUI (already."       
+             printf "\n\n"
+             echo "  *** skipped compilation of check_namelist_files."            
+          fi
 
        fi
@@ -1445 +1458 @@
     # FINAL WORK
  rm -f  hosts_found_in_config_file
-
+ rm -f ${local_source_path}/${mainprog}_sources_check.tar
+

palm/trunk/UTIL/mrungui/mainwindow.cpp

@@ -2 +2 @@
 // Current revisions:
 // -----------------
+// Bugfix: waitForFinished time exceeded limits, adjusted to 1h waiting time
 //
 // Former revisions:
@@ -224 +225 @@
 //        xtermoutput = xtermoutput+mrun.readAllStandardOutput();
 
-//  Wait until mrun has finished or wait for 2000 minutes
-    mrun.waitForFinished(12000000000);
+//  Wait until mrun has finished or wait for 200 minutes
+    mrun.waitForFinished(3600000);