Changeset 1083 for palm/trunk/SCRIPTS


Ignore:
Timestamp:
Jan 4, 2013 10:22:09 AM (11 years ago)
Author:
maronga
Message:

bugfixes in parameter file check

Location:
palm/trunk/SCRIPTS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r1082 r1083  
    2020# Current revisions:
    2121# -----------------
     22# bugfix in parameter file check (in case that no preprocessor flag, i.e. -cpp was
     23# set in %cpp_options, the last directive in the variable was processed.
    2224#
    2325# Former revisions:
     
    15311533             tar -xf  ${mainprog}_sources_check.tar
    15321534             rm -rf ${mainprog}_sources_check.tar
    1533              make  -f Makefile_check $make_options  F90=$compiler_name_ser  COPT="$copts_check"  F90FLAGS="$compiler_options" LDFLAGS="$loader_options"
     1535             make  -f Makefile_check $make_options  F90=$compiler_name_ser  COPT="$copts_check"  F90FLAGS="$compiler_options"
    15341536             tar -cf  check_namelist_files.tar Makefile_check check_namelist_files.x *.f90 *.o *.mod
    15351537             mv check_namelist_files.tar $check_depository_path
  • palm/trunk/SCRIPTS/mrun

    r1070 r1083  
    2222# Current revisions:
    2323# -----------------
    24 #
     24# bugfix in parameter file check (read %cpp_options was missing)
    2525#
    2626# Former revisions:
     
    22122212
    22132213#ONLY PERFORM CHECK IF -z OPTION IS NOT SET, NO RESTART RUN IS CARRIED OUT AND IF THE EXECUTION HOST IS THE LOCAL HOST
     2214# ATTENTION: THIS ROUTINE DOES NOT WORK IF THE COMPILER ON THE LOCAL HOST DIFFERS FROM THE COMPILER ON THE REMOTE HOST
    22142215 if [[ $check_namelist_files == false ]]
    22152216 then
     
    23502351       fi
    23512352
    2352        copts_check="-cpp -D__parallel -D__check"
     2353       # GET CHECK OPTIONS
     2354       line=""
     2355       found=false
     2356
     2357       grep  "$localhost" ${base_directory}/${config_file} | grep "%cpp_options"  >  $tmp_check
     2358
     2359       while read line1
     2360       do
     2361
     2362          if [[ $(echo $line1 | cut -d" " -s -f3-) = "$localhost" ]]
     2363          then
     2364             line="$line1"
     2365          fi
     2366
     2367          if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
     2368          then
     2369          # EVENTUELLE DOPPELPUNKTE AUS OPTIONSSTRING UND ALLE -D ENTFERNEN
     2370          line="$line "
     2371             copts_check=`echo $line | cut -d" " -s -f2 | sed 's/::/%DUM%/g' | sed 's/:/ /g' | sed 's/%DUM%/:/g' | sed 's/-D[^ ]* //g' | sed 's/ -D.*//g'`
     2372             found=true
     2373          fi
     2374
     2375       done < $tmp_check
     2376       copts_check="$copts_check -D__check -D__parallel"
     2377
    23532378       make -f Makefile_check F90=$compiler_name_ser  COPT="$copts_check"
    23542379
Note: See TracChangeset for help on using the changeset viewer.