#
# ChangeLog for XIOS/dev/branch_yushan_merged/src/config
#
# Generated by Trac 1.0.1
# 07/08/24 20:28:14

Tue, 06 Jun 2017 17:06:45 GMT yushan [1160]
	* XIOS/dev/branch_yushan_merged/arch/arch-local.env (modified)
	* XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_declaration.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/client.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/client.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/config/file_attribute.conf (modified)
	* XIOS/dev/branch_yushan_merged/src/cxios.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/onetcdf4.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/onetcdf4_impl.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/log.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/log.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/memtrack.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/memtrack.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/node/context.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/node/field.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/node/file.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/server.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/timer.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/timer.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/average_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/max_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/min_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/sum_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/generic_algorithm_transformation.cpp (modified)

	fix bad commit. Back to R1155 branch not merged


Tue, 06 Jun 2017 13:52:13 GMT yushan [1156]
	* XIOS/dev/branch_yushan_merged/arch/arch-local.env (modified)
	* XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_declaration.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/client.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/client.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/config/file_attribute.conf (modified)
	* XIOS/dev/branch_yushan_merged/src/cxios.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/onetcdf4.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/io/onetcdf4_impl.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/log.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/log.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/memtrack.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/memtrack.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/node/context.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/node/field.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/node/file.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/server.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/timer.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/timer.hpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/average_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/max_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/min_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/Functions/sum_reduction.cpp (modified)
	* XIOS/dev/branch_yushan_merged/src/transformation/generic_algorithm_transformation.cpp (modified)

	branch merged with trunk @1155


Mon, 15 May 2017 13:28:14 GMT yushan [1131]
	* XIOS/dev/branch_yushan_merged (copied)

	creating a new branch for merge


Wed, 03 May 2017 13:07:53 GMT ymipsl [1114]
	* XIOS/trunk/extern/remap/src/mapper.cpp (modified)
	* XIOS/trunk/extern/remap/src/mapper.hpp (modified)
	* XIOS/trunk/src/config/interpolate_domain_attribute.conf (modified)
	* XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp (modified)

	Add conservative remapping option for quantity, ie, the integrated
	value ...