Changeset 1789


Ignore:
Timestamp:
Jul 16, 2013, 4:41:41 PM (11 years ago)
Author:
Ehouarn Millour
Message:

Revert make* scripts to what they were at rev 1784 (they were mistakenly modified in revision 1785).
EM

Location:
LMDZ5/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/bld.cfg

    r1785 r1789  
    106106bld::outfile_ext::mod .mod
    107107bld::tool::SHELL   /bin/bash
    108 bld::tool::SHELL   /bin/ksh

  • LMDZ5/trunk/makegcm

    r1785 r1789  
    2323set OPTIMI='-C debug -eC '
    2424set OPTIMI=' -ftrace '
    25 set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
    26 set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
     25set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
     26set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
    2727set io=ioipsl
    2828set cosp=false
    2929
    30 set FC_LINUX=gfortran
    31 set FC_LINUX=gfortran
    32 #set FC_LINUX=gfortran
    33 if ( $FC_LINUX == gfortran ) then
    34   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
     30set FC_LINUX=g95
     31set FC_LINUX=g95
     32#set FC_LINUX=g95
     33if ( $FC_LINUX == g95 ) then
     34  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
    3535else if ( $FC_LINUX == gfortran ) then
    36   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
    37 #   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
    38   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
     36  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
     37#   set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
     38  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
    3939else
    4040# pgf90 options
    41   set OPT_LINUX="-O3 -fdefault-real-8 -DNC_DOUBLE"
     41  set OPT_LINUX="-i4 -O3 -r8 -DNC_DOUBLE"
    4242endif
    4343
    … …  
    5454setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
    5555setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
    56 setenv NCDFINC /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/include
    57 setenv NCDFLIB /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/lib
     56setenv NCDFINC /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/include
     57setenv NCDFLIB /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/lib
    5858
    5959
    … …  
    107107  if ( ! $?NCDFLIB ) then
    108108    echo You must initialize the variable NCDFLIB in your environnement
    109     echo for instance: "setenv NCDFLIB /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/lib
     109    echo for instance: "setenv NCDFLIB /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/lib
    110110    exit
    111111  endif
    112112  if ( ! $?NCDFINC ) then
    113113    echo You must initialize the variable NCDFINC in your environnement
    114     echo for instance: "setenv NCDFINC /home/users/uglmd/lmdz/MAMBO/LMDZXIOS/LMDZtrunk/netcdf-4.0.1/include
     114    echo for instance: "setenv NCDFINC /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/include
    115115    exit
    116116  endif
    … …  
    262262else if $LINUX then
    263263#################
    264    if ( $FC_LINUX == pgf90 || $FC_LINUX == gfortran || $FC_LINUX == gfortran ) then
     264   if ( $FC_LINUX == pgf90 || $FC_LINUX == g95 || $FC_LINUX == gfortran ) then
    265265     set optim=" $OPT_LINUX "
    266266     set optim90=" $OPT_LINUX "
    … …  
    519519             set optim90="$optim90"" -g -ffpe-trap=invalid,zero,overflow -fbounds-check -Wall "
    520520             set optimtru90="$optimtru90"" -ffpe-trap=invalid,zero,overflow -g -fbounds-check -Wall "
    521            else if ( $FC_LINUX == 'gfortran' ) then
     521           else if ( $FC_LINUX == 'g95' ) then
    522522             set optim="$optim"" -g -fbounds-check -freal=nan -ftrace=full -Wall "
    523523             set optim90="$optim90"" -g -fbounds-check -freal=nan -ftrace=full -Wall "
    … …  
    841841       set opt_link="$opt_link  -L$MODIPSLDIR $link_veget -L$NCDFLIB -lnetcdf "
    842842     endif
    843    else if ($FC_LINUX == 'gfortran' || $FC_LINUX == 'gfortran' ) then
     843   else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
    844844     if ( $io == "ioipsl" ) then
    845        set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB  -lnetcdf -lioipsl -lnetcdf "
     845       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf -lioipsl -lnetcdff -lnetcdf "
    846846     else
    847        set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf "
     847       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf "
    848848     endif
    849849   endif
    … …  
    10151015   set optimtru90=" $optimtru90 -module $libo "
    10161016   set optim90=" $optim90 -module $libo "
    1017  else if ( $FC_LINUX == 'gfortran' ) then
    1018    set optimtru90=" $optimtru90 -I$libo  "
    1019    set optim90=" $optim90 -I$libo  "
     1017 else if ( $FC_LINUX == 'g95' ) then
     1018   set optimtru90=" $optimtru90 -fmod=$libo  "
     1019   set optim90=" $optim90 -fmod=$libo  "
    10201020 else if ( $FC_LINUX == 'gfortran' ) then
    10211021   set optimtru90=" $optimtru90 -M $libo  "

  • LMDZ5/trunk/makelmdz

    r1785 r1789  
    364364   CPP_KEY="$CPP_KEY CPP_VEGET ORCHIDEE_NOOPENMP"
    365365   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    366    LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate  "
     366   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
    367367elif [[ "$veget" == "true" ]]
    368368then
    … …  
    372372   CPP_KEY="$CPP_KEY CPP_VEGET"
    373373   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    374    LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate  "
     374   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
    375375elif [[ "$veget" != "false" ]]
    376376then

  • LMDZ5/trunk/makelmdz_fcm

    r1785 r1789  
    261261   CPP_KEY="$CPP_KEY CPP_VEGET ORCHIDEE_NOOPENMP"
    262262   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    263    LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate  "
     263   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
    264264elif [[ "$veget" == "true" ]]
    265265then
    … …  
    269269   CPP_KEY="$CPP_KEY CPP_VEGET"
    270270   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    271    LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate  "
     271   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
    272272elif [[ "$veget" != "false" ]]
    273273then
Note: See TracChangeset for help on using the changeset viewer.