[cdftools] 199/228: JMM : update mcaro.ada for cdftools

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdftools.

commit eca2e10943db0be09afc3cd702f00661fc2b1870
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Fri Mar 15 09:10:31 2013 +0000

    JMM : update mcaro.ada for cdftools
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@647 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 Macrolib/macro.ada | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Macrolib/macro.ada b/Macrolib/macro.ada
index cac5c05..7d9d883 100644
--- a/Macrolib/macro.ada
+++ b/Macrolib/macro.ada
@@ -4,20 +4,16 @@
 #  $Id$
 # -------------------------------------------------------------
 #
-NCDF=/smplocal/pub/NetCDF/4.1.3
-HDF5=/smplocal/pub/HDF5/1.8.9/seq
  
 F90=ifort
-MPF90=/opt/ibmhpc/pe1209/ppe.poe/bin/mpif90 -compiler ifort
+MPF90=mpiifort
 
-# flag static is used to allow the use of CDFTOOLS in parallel with mpi_metamon
-#FFLAGS= -O  $(NCDF) -assume byterecl -convert big_endian -CB -fpe0 -g -traceback -ftrapuv
+# assume compiler wrapper is working for netcdf on ada 
 
-FFLAGS= -O2 -I$(NCDF)/include -L$(NCDF)/lib -L$(HDF5)/lib -assume byterecl -convert big_endian -lnetcdff -lnetcdf  -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -lz
+# flag static is used to allow the use of CDFTOOLS in parallel with mpi_metamon
+#FFLAGS= -O   -assume byterecl -convert big_endian -CB -fpe0 -g -traceback -ftrapuv
 
-#FFLAGS= -static -O  $(NCDF) -assume byterecl -convert big_endian
-#FFLAGS= -static -O  $(NCDF) -assume byterecl -convert big_endian -g -traceback -fpe0 -ftrapuv -CB
-LMPI=-lmpich
+FFLAGS= -O2 -assume byterecl -convert big_endian 
 
 INSTALL=$(WORKDIR)/bin
 INSTALL_MAN=$(WORKDIR)/man

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdftools.git