Changeset 1703 for LMDZ5/trunk


Ignore:
Timestamp:
Dec 21, 2012, 3:36:02 PM (12 years ago)
Author:
Laurent Fairhead
Message:

Modify create_make_gcm to force make to stop at the first problem.
Change the option make -k to -S to make the make command effectively stop
FH

Location:
LMDZ5/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/create_make_gcm

    r1692 r1703  
    224224         # Put generated object in library
    225225         echo ' $(AR) r $(LIBO)/lib'$diri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
    226          echo ' cd $(GCM)'
    227226         echo
    228227      done
  • LMDZ5/trunk/makegcm

    r1666 r1703  
    5252#
    5353#
    54 setenv IOIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
    55 setenv MODIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
    56 setenv NCDFINC /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/include
    57 setenv NCDFLIB /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/lib
     54setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
     55setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/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
     
    149149   set machine=ALPHA
    150150   set DEC=1
    151 else if ( `uname` == Linux && `hostname` != mercure  && `hostname` != brodie ) then
     151else if ( `uname` == Linux || `uname` == Darwin && `hostname` != mercure  && `hostname` != brodie ) then
    152152   set machine=LINUX
    153153   set LINUX=1
     
    843843   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 -lnetcdf "
     847       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf "
    848848     endif
    849849   endif
     
    963963set make="make RANLIB=ls"
    964964else if $LINUX then
    965 set make="make -k RANLIB=ranlib"
     965set make="make -S RANLIB=ranlib"
    966966else if $XNEC then
    967967set make="gmake RANLIB=ls"
Note: See TracChangeset for help on using the changeset viewer.