Changeset 1703

Timestamp:

Dec 21, 2012, 3:36:02 PM (11 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:

• create_make_gcm (modified) (1 diff)
• makegcm (modified) (4 diffs)

LMDZ5/trunk/create_make_gcm

@@ -224 +224 @@
          # Put generated object in library
          echo ' $(AR) r $(LIBO)/lib'$diri'.a '$fili'.o ; $(RM) '$fili'.o ; \'
-         echo ' cd $(GCM)'
          echo
       done

LMDZ5/trunk/makegcm

@@ -52 +52 @@
 #
 #
-setenv IOIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
-setenv MODIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
-setenv NCDFINC /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/include
-setenv NCDFLIB /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/lib
+setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
+setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
+setenv NCDFINC /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/include
+setenv NCDFLIB /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/lib
 
 
@@ -149 +149 @@
    set machine=ALPHA
    set DEC=1
-else if ( `uname` == Linux && `hostname` != mercure  && `hostname` != brodie ) then
+else if ( `uname` == Linux || `uname` == Darwin && `hostname` != mercure  && `hostname` != brodie ) then
    set machine=LINUX
    set LINUX=1
@@ -843 +843 @@
    else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
      if ( $io == "ioipsl" ) then
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf -lioipsl -lnetcdff -lnetcdf "
      else
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf "
      endif
    endif
@@ -963 +963 @@
 set make="make RANLIB=ls"
 else if $LINUX then
-set make="make -k RANLIB=ranlib"
+set make="make -S RANLIB=ranlib"
 else if $XNEC then
 set make="gmake RANLIB=ls"