Fixed bug in heatc and improved error handling in cdfio

.gitignore

@@ -1,16 +1,28 @@
 *~
 *.mod
 *.o
+<<<<<<< HEAD
+=======
+CMakeCache.txt
+CMakeFiles
+.metadata/
+cmake_install.cmake
+lib
+bin
+>>>>>>> develop-cmake
 *.so
 *.pyf
 *.pdf
 *.log
 *.aux
 *.idx
 *.toc
+<<<<<<< HEAD
 CMakeCache.txt
 CMakeFiles
 .metadata/
 cmake_install.cmake
 lib
 bin
+=======
+>>>>>>> develop-cmake

License/CDFTOOLSCeCILL.txt

@@ -3,11 +3,11 @@ The following licence information concerns ONLY the CDFTOOLS package
 
 Copyright  IGE-MEOM ([email protected] )
 Contributors (alphabetic order ) : 
-C.Q. Akuetevi, M. Balmaseda, E. Behrens, F. Castruccio, P. Colombo, 
-J. Deshayes, N. Djath, N. Ducousso, C. Dufour, R. Dussin, N. Ferry, 
-F. Hernandez, M. Juza, A. Lecointre, S. Leroux, G. Mainsant, P. Mathiot, 
-A. Melet, X. Meunier, G. Moreau, W. Rath, J. Regidor, M. Scheinert,
-A.M. Treguier
+C.Q. Akuetevi, M. Balmaseda, E. Behrens, F. Castruccio, M. Chekki, 
+P. Colombo, J. Deshayes, N. Djath, N. Ducousso, C. Dufour, R. Dussin, 
+N. Ferry, F. Hernandez, M. Juza, A. Lecointre, S. Leroux, G. Mainsant, 
+P. Mathiot, A. Melet, X. Meunier, G. Moreau, N. Merino, W. Rath, 
+J. Regidor, M. Scheinert, A.M. Treguier
 
 This software is a computer program for analysis of NEMO model output 
 produced in the frame of the DRAKKAR project. It is designed  for the

Macrolib/macro.occigen2

@@ -0,0 +1,22 @@
+# macro.jade for jade at CINES
+#  $Rev: 539 $
+#  $Date: 2011-07-11 12:33:35 +0200 (Mon, 11 Jul 2011) $
+#  $Id: macro.jade 539 2011-07-11 10:33:35Z molines $
+# -------------------------------------------------------------
+
+NCDF = -I$(NETCDF_INCDIR) -I$(NETCDFF_INCDIR) $(NETCDF_LDFLAGS) $(NETCDFF_LDFLAGS)
+
+#NC4=
+NC4=-Dkey_netcdf4
+
+F90=ifort
+MPF90=mpif90
+# flag static is used to allow the use of CDFTOOLS in parallel with mpi_metamon
+#FFLAGS= -static -O  $(NCDF) -assume byterecl -convert big_endian
+
+FFLAGS= -O  $(NCDF) $(NC4) -fp-model precise
+#FFLAGS= -O  $(NCDF) $(NC4) -assume byterecl -convert big_endian -CB -fpe0 -ftrapuv -traceback -g
+
+LMPI=-lmpich
+
+INSTALL=$(WORKDIR)/bin

README.md

@@ -11,9 +11,11 @@ To retrieve a copy of the CDFTOOLS source code and create a working directory, r
 ```> git clone https://github.com/meom-group/CDFTOOLS ```
 
 #### Compiling CDFTOOLS
-There is a Makefile for compiling the sources. The compiler/machines related definitions are supposed to be collected in a `make.macro` file. Some examples of `make.macro` are given in the Macrolib directory and can be used as template for a new compiler or new machine. Then the good practice is to make a link 
+All the fortran source are in src/ subdirectory. In src/ there is a Makefile for compiling the sources. The compiler/machines related definitions are supposed to be collected in a `make.macro` file. Some examples of `make.macro` are given in the Macrolib directory and can be used as template for a new compiler or new machine. Then the good practice is to make a link 
 
-```>  ln -sf Macrolib/macro.MACHINE  make.macro ```
+```> cd src/```
+
+```> ln -sf ../Macrolib/macro.MACHINE  make.macro```
 
 In the `make.macro` file, the PATH for the netcdf library is specified, as well as compiler name and used flags.  In order to activate netcdf4/HDF5 chunking and deflation ( available in some cdftools), you need to set: 
 

src/CMakeLists.txt

@@ -150,9 +150,17 @@ add_executable(cdfmppini cdfmppini.f90)
 add_executable(cdffixtime cdffixtime.f90)
 add_executable(cdfnamelist cdfnamelist.f90)
 add_executable(cdfchgrid cdfchgrid.f90)
+target_link_libraries (cdfchgrid modutils)
 add_executable(cdfcmp cdfcmp.f90)
-add_executable(cdffwc cdffwc.f90)
-target_link_libraries (cdffwc modutils)
+add_executable(cdfisf_rnf cdfisf_rnf.f90)
+add_executable(cdfisf_forcing cdfisf_forcing.f90)
+target_link_libraries (cdfisf_forcing modutils)
+add_executable(cdfisf_fill cdfisf_fill.f90)
+target_link_libraries (cdfisf_fill modutils)
+add_executable(cdfisf_poolchk cdfisf_poolchk.f90)
+target_link_libraries (cdfisf_poolchk modutils)
+# add_executable(cdficbclimato cdficbclimato.f90)
+# add_executable(cdficbdiags cdficbdiags.f90)
 
 link_libraries(eos)