[cmor] 124/190: clim files end in -clim.nc instead of _clim.nc
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit 34739bd0b5f304d5f7aba21113e4b8dfc5a29b3e
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Mon Jan 30 11:01:35 2012 -0800
clim files end in -clim.nc instead of _clim.nc
---
Makefile.in | 40 +++++++++++++++++++++-------------------
RELEASE-NOTES | 2 ++
Src/cmor.c | 2 +-
configure | 16 +++++++++++++++-
configure.ac | 8 ++++++++
5 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5baca02..f45a18d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
#!/usr/bin/env sh
FC=@FC@
CPPFLAGS_USER=""
-FFLAGS_USER="-fPIC"
+FFLAGS_USER="-fPIC @USERFFLAGS@"
#MODULE_SUFFIX="mod"
PREFIX=@prefix@
FCFLAGS=@FCFLAGS@
@@ -10,6 +10,8 @@ NO_COLOR2=\x1b[0m
OK_COLOR2=\x1b[2;34m
NO_COLOR=${@NO_COLOR@}
OK_COLOR=${@OK_COLOR@}
+CFLAGS="@USERCFLAGS@"
+
# Library name
@@ -28,36 +30,36 @@ INCFILES = @INCFILES@
# Temporary Files
TMPFILES = *~ $(LIBFILES) *.mod a.out *.stb Test/*.nc Test/IPCC_Fourth_Assessment *.LOG* *.dSYM Test/IPCC Test/CMIP5 CMIP5
DISTFILES = libcmor.a
-DEPEND= makedepend -c @DEBUG@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@
+DEPEND= makedepend -c @DEBUG@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@
all: cmor
@echo
depend: $(LIBSOURCES)
${DEPEND} $(LIBSOURCES)
cmor.o: Src/cmor.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor.c
cmor_variables.o: Src/cmor_variables.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_variables.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_variables.c
cmor_axes.o: Src/cmor_axes.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_axes.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_axes.c
cmor_tables.o: Src/cmor_tables.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_tables.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_tables.c
cmor_grids.o: Src/cmor_grids.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_grids.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_grids.c
cmor_md5.o: Src/cmor_md5.c include/cmor.h include/cmor_func_def.h include/cmor_md5.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_md5.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_md5.c
cmor_cfortran_interface.o: Src/cmor_cfortran_interface.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_cfortran_interface.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cmor_cfortran_interface.c
cdTimeConv.o: Src/cdTime/cdTimeConv.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/cdTimeConv.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/cdTimeConv.c
cdUtil.o: Src/cdTime/cdUtil.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/cdUtil.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/cdUtil.c
timeConv.o: Src/cdTime/timeConv.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/timeConv.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/timeConv.c
timeArith.o:Src/cdTime/timeArith.c include/cmor.h include/cmor_func_def.h
- @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/timeArith.c
+ @CC@ -c @DEBUG@ @MACROS@ @CFLAGS@ @USERCFLAGS@ @NCCFLAGS@ @UDUNITS2FLAGS@ @UUIDFLAGS@ @ZFLAGS@ Src/cdTime/timeArith.c
cmor_fortran_interface.o: Src/cmor_fortran_interface.f90
- @FC@ -c @FCFLAGS@ @DEBUG@ @MACROS@ Src/cmor_fortran_interface.f90
+ @FC@ -c @FCFLAGS@ @USERFFLAGS@ @DEBUG@ @MACROS@ Src/cmor_fortran_interface.f90
cmor: $(LIBFILES) @MAKEDEPPYTHON@
@ar crv $(LIBNAME) $(LIBFILES)
@ranlib $(LIBNAME)
@@ -89,9 +91,9 @@ backup: clean
test: cmor test_C @TEST_FORTRAN@ @MAKETESTPYTHON@
@echo "All C and Fortran Test passed successfully"
test_C: cmor
- @rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
- @rm -f test_grid ; @CC@ @CFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
- @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
+ @rm -f ./ipcc_test_code ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/ipcc_test_code.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o ipcc_test_code @VERB@; ./ipcc_test_code @VERB@
+ @rm -f test_grid ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_grid.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_grid @VERB@; ./test_grid @VERB@;
+ @rm -f test_lots_of_variables ; @CC@ @CFLAGS@ @USERCFLAGS@ @CPPFLAGS@ Test/test_lots_of_variables.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ -o test_lots_of_variables @VERB@; ./test_lots_of_variables @VERB@;
python:
@echo "Building Python interface"
@${PYTHONEXEC} setup.py install @CDATPREFIX@
@@ -155,7 +157,7 @@ test_python: python
test_case:
@echo "${OK_COLOR}Testing: "${TEST_NAME}" with input file: ${INPUT_FILE}${NO_COLOR}"
- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
+ @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @USERFFLAGS@ @FCFLAGS@ @DEBUG@ Test/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
@./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
@ rm ./${TEST_NAME}
ifeq (@MAKEDEPPYTHON@,python)
@@ -163,7 +165,7 @@ ifeq (@MAKEDEPPYTHON@,python)
endif
test_case_old_cmor_tables:
@echo "Testing: "${TEST_NAME}" with input file: "${INPUT_FILE}
- @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @FCFLAGS@ @DEBUG@ Test/old_cmor_tables/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
+ @rm -f ./${TEST_NAME} 2>/dev/null ; @FC@ @USERFFLAGS@ @FCFLAGS@ @DEBUG@ Test/old_cmor_tables/${TEST_NAME}.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o ${TEST_NAME} ;
@./${TEST_NAME} @VERB@ < ${INPUT_FILE} ;
@ rm ./${TEST_NAME}
ifeq (@MAKEDEPPYTHON@,python)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 52552c4..587ad12 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2012-01-30 : Tagging 2.8.1
+2012-01-30 : climatological files now end wirh -clim.nc instead of _clim.nc
2011-11-08 : Tagging 2.8.0
2011-11-08 : Realized there was a difference in calendar names between cdtime and the CF conventions. CMOR now maps correctly the CF names to the cdtime names for correct internal processing.
2011-10-24 : Removed the treatlon in case 'X' axis has units not in degrees
diff --git a/Src/cmor.c b/Src/cmor.c
index 18f9431..c1ca361 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -3783,7 +3783,7 @@ int cmor_close_variable(int var_id, char *file_name, int *preserve)
}
if (cmor_tables[cmor_axes[cmor_vars[var_id].axes_ids[0]].ref_table_id].axes[cmor_axes[cmor_vars[var_id].axes_ids[0]].ref_axis_id].climatology==1) {
- strncat(outname,"_clim",CMOR_MAX_STRING-strlen(outname));
+ strncat(outname,"-clim",CMOR_MAX_STRING-strlen(outname));
}
}
/* else { */
diff --git a/configure b/configure
index 891c009..4fe81e9 100755
--- a/configure
+++ b/configure
@@ -644,6 +644,9 @@ FFLAGS
FCFLAGS
LDFLAGS
CFLAGS
+USERCFLAGS
+USERFFLAGS
+USERLDFLAGS
INCFILES
TEST_FORTRAN
LIBFILES
@@ -1922,6 +1925,10 @@ INCFILES="include/cmor.h include/cmor_func_def.h include/cmor_md5.h "`ls -x --w
+
+
+
+
MACROS=""
DEBUG=""
@@ -4326,6 +4333,10 @@ fi
fi
fi
+USERCFLAGS=${CFLAGS}
+USERFFLAGS=${FFLAGS}
+USERLDFLAGS=${LDFLAGS}
+
CFLAGS=${NCCFLAGS}
LDFLAGS=${NCLDFLAGS}
@@ -5260,6 +5271,9 @@ FFLAGS!$FFLAGS$ac_delim
FCFLAGS!$FCFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
CFLAGS!$CFLAGS$ac_delim
+USERCFLAGS!$USERCFLAGS$ac_delim
+USERFFLAGS!$USERFFLAGS$ac_delim
+USERLDFLAGS!$USERLDFLAGS$ac_delim
INCFILES!$INCFILES$ac_delim
TEST_FORTRAN!$TEST_FORTRAN$ac_delim
LIBFILES!$LIBFILES$ac_delim
@@ -5289,7 +5303,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 4e9804a..ef45563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,10 @@ AC_SUBST(FFLAGS)
AC_SUBST(FCFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS)
+AC_SUBST(USERCFLAGS)
+AC_SUBST(USERFFLAGS)
+AC_SUBST(USERLDFLAGS)
+
AC_SUBST(INCFILES)
AC_SUBST(TEST_FORTRAN)
AC_SUBST(LIBFILES)
@@ -234,6 +238,10 @@ else
fi
fi
+USERCFLAGS=${CFLAGS}
+USERFFLAGS=${FFLAGS}
+USERLDFLAGS=${LDFLAGS}
+
CFLAGS=${NCCFLAGS}
LDFLAGS=${NCLDFLAGS}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list