Changeset 818 for palm/trunk/SCRIPTS


Ignore:
Timestamp:
Feb 8, 2012 4:11:23 PM (11 years ago)
Author:
maronga
Message:

bugfix: namelist file check now possible for topography and re-enabled. mrungui update (-z option)

Location:
palm/trunk/SCRIPTS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r811 r818  
    128128     # 31/01/12 - BjornM- bugfix for compilation of utility programs on
    129129     #                    multiple localhost branches
     130     # 08/03/12 - BjornM- bugfix: cpp directive for namelist check program
     131     #                    corrected
    130132
    131133
     
    14211423             rm -rf ${mainprog}_sources_check.tar
    14221424
    1423              copts_check="-cpp -D_parallel -D__check"
     1425             copts_check="-cpp -D__parallel -D__check"
    14241426             make  -f Makefile_check $make_options F90=$compiler_name_ser  COPT="$copts_check"
    14251427
     
    14331435             cd $check_depository_path
    14341436             printf "\n\n"
    1435              echo "  *** skipped compilation of mrun GUI (already."       
     1437             echo "  *** skipped compilation of mrun GUI."       
    14361438             printf "\n\n"
    14371439             echo "  *** skipped compilation of check_namelist_files."           
  • palm/trunk/SCRIPTS/mrun

    r815 r818  
    239239     # 03/02/12 - BjornM - namelist file check temporary disabled
    240240     #                     until severel bugs are fixed
     241     # 08/02/12 - BjornM - bugfixes: skipping namelist file check in case of
     242     #                     restart runs. check is now possible with topography
     243     #                     and the -v (silent) option is considered
    241244 
    242245    # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
     
    24042407
    24052408#### PERFORM PARAMETER FILE CHECK (COUPLED RUNS ARE NOT SUPPORTED YET)
    2406  skip_check=true
    2407  if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true ]]
     2409 skip_check=false
     2410 if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true || $restart_run == true ]]
    24082411 then
    24092412    skip_check=true
     
    24632466       printf "\n  +++ no PARIN list entry found for d3f in the configuration file."
    24642467    fi
     2468#   GET TOPOGRAPHY PARAMETER FILE SUFFIX (USUALLY "_P3DF"). THIS FILE MIGHT IS
     2469#   NOT NECESSARILY REQUIRED
     2470    line=""
     2471    found=false
     2472    grep  "d3f" $config_file | grep "TOPOGRAPHY_DATA"  >  $tmp_check
     2473    while read line1
     2474    do
     2475       line="$line1"
     2476       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
     2477       then
     2478          topo_suffix=`echo $line | tr -s " " | cut -d" " -s -f5`
     2479          found=true
     2480       fi
     2481    done < $tmp_check
     2482
     2483    if [[ $found = false ]]
     2484    then
     2485       printf "\n  +++ no TOPOGRAPHY list entry found in the configuration file."
     2486    fi
    24652487
    24662488    rm -rf ${working_directory}/tmp_check
     
    24982520          printf "\n\n"
    24992521
    2500           while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
    2501           do
    2502              printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
    2503              read  answer
    2504           done
    2505           if [[ $answer = a  ||  $answer = A ]]
    2506           then
    2507              printf "\n  +++ Aborting...."
    2508              locat=normal; exit
     2522          if [[ $silent == false ]]
     2523          then
     2524             while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
     2525             do
     2526                printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
     2527                read  answer
     2528             done
     2529             if [[ $answer = a  ||  $answer = A ]]
     2530             then
     2531                printf "\n  +++ Aborting...."
     2532                locat=normal; exit
     2533             fi
    25092534          fi
    25102535       else
     
    25412566          answer=dummy
    25422567          printf "\n\n"
    2543           while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
    2544           do
    2545              printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
    2546              read  answer
    2547           done
    2548           if [[ $answer = a  ||  $answer = A ]]
    2549           then
    2550              printf "\n  +++ Aborting..."
    2551              rm -rf  $check_sources
    2552              locat=normal; exit
     2568          if [[ $silent == false ]]
     2569          then
     2570             while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
     2571             do
     2572                printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
     2573                read  answer
     2574             done
     2575             if [[ $answer = a  ||  $answer = A ]]
     2576             then
     2577                printf "\n  +++ Aborting..."
     2578                rm -rf  $check_sources
     2579                locat=normal; exit
     2580             else
     2581                skip_check=true
     2582             fi
    25532583          else
    25542584             skip_check=true
     
    25632593    then
    25642594       cp $working_directory/JOBS/$fname/INPUT/${fname}${p3df_suffix} ./PARINF   
     2595    fi
     2596
     2597
     2598    if [[ -f $working_directory/JOBS/$fname/INPUT/${fname}${topo_suffix} && $skip_check == false ]]
     2599    then
     2600       printf "\n  *** adding topography data"
     2601       cp $working_directory/JOBS/$fname/INPUT/${fname}${topo_suffix} ./TOPOGRAPHY_DATA
     2602
     2603#      IN CASE OF TOPOGRAPHY AND HIGH GRID POINT NUMBERS, THE STACK SIZE
     2604#      MUST BE INCREASED. THIS IS DUE TO THE ARRAY nzb_local AND topo_height,
     2605#      WHICH REQUIRE SUFFICIENT MEMORY
     2606       ulimit -s unlimited         
    25652607    fi
    25662608
     
    25772619
    25782620#   SAFETY CHECK: ONLY PROCEED IF THE PARAMETER CHECK PROGRAM WAS PROPERLY COMPILED
    2579     if [[ ! -f check_namelist_files.x ]] then
     2621    if [[ ! -f check_namelist_files.x && $skip_check == false ]] then
    25802622       printf "\n  +++ WARNING: check_namelist_files.x not found."
    25812623       answer=dummy
    25822624       printf "\n\n"
    2583        while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
    2584        do
    2585           printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
    2586           read  answer
    2587        done
    2588        if [[ $answer = a  ||  $answer = A ]]
    2589        then
    2590           printf "\n  +++ Aborting..."
    2591           rm -rf  $check_sources
    2592           locat=normal; exit
    2593        else
    2594           printf "\n  *** Skipping parameter file check."
    2595        fi       
     2625
     2626       if [[ $silent == false ]]
     2627       then
     2628          while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
     2629          do
     2630             printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
     2631             read  answer
     2632          done
     2633          if [[ $answer = a  ||  $answer = A ]]
     2634          then
     2635             printf "\n  +++ Aborting..."
     2636             rm -rf  $check_sources
     2637             locat=normal; exit
     2638          else
     2639             printf "\n  *** Skipping parameter file check."
     2640         
     2641          fi
     2642      fi
     2643       
    25962644    elif [[ $skip_check == false ]]
    25972645    then
     
    26942742 fi
    26952743
     2744    # DELETE TEMPORARY DIRECTORY AND FINISH NAMELIST FILE CHECK   
     2745 rm -rf  $check_sources
    26962746 cd $working_directory
    26972747
Note: See TracChangeset for help on using the changeset viewer.