diff --git a/.gitignore b/.gitignore index 2ce2a2243..30b33c976 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,9 @@ /Debug/ # Test project output -/testing/Output/* -/testing/Output_* +/tests/example/Output/* +/tests/example/Output_* + # Figures created by scripts in tools/ /tools/Fig* @@ -39,7 +40,7 @@ doc/Doxyfile.bak # Binary files SOILWAT2 -testing/SOILWAT2 +tests/example/SOILWAT2 libSOILWAT2* libcovSOILWAT2* diff --git a/.gitmodules b/.gitmodules index cad0b4e19..8d43eccfa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "googletest"] - path = googletest + path = external/googletest url = https://github.com/google/googletest branch = main [submodule "pcg"] - path = pcg + path = external/pcg url = https://github.com/imneme/pcg-c-basic branch = master diff --git a/googletest b/external/googletest similarity index 100% rename from googletest rename to external/googletest diff --git a/pcg b/external/pcg similarity index 100% rename from pcg rename to external/pcg diff --git a/SW_Carbon.h b/include/SW_Carbon.h similarity index 100% rename from SW_Carbon.h rename to include/SW_Carbon.h diff --git a/SW_Control.h b/include/SW_Control.h similarity index 100% rename from SW_Control.h rename to include/SW_Control.h diff --git a/SW_Defines.h b/include/SW_Defines.h similarity index 100% rename from SW_Defines.h rename to include/SW_Defines.h diff --git a/SW_Files.h b/include/SW_Files.h similarity index 100% rename from SW_Files.h rename to include/SW_Files.h diff --git a/SW_Flow.h b/include/SW_Flow.h similarity index 100% rename from SW_Flow.h rename to include/SW_Flow.h diff --git a/SW_Flow_lib.h b/include/SW_Flow_lib.h similarity index 100% rename from SW_Flow_lib.h rename to include/SW_Flow_lib.h diff --git a/SW_Flow_lib_PET.h b/include/SW_Flow_lib_PET.h similarity index 100% rename from SW_Flow_lib_PET.h rename to include/SW_Flow_lib_PET.h diff --git a/SW_Main_lib.h b/include/SW_Main_lib.h similarity index 100% rename from SW_Main_lib.h rename to include/SW_Main_lib.h diff --git a/SW_Markov.h b/include/SW_Markov.h similarity index 100% rename from SW_Markov.h rename to include/SW_Markov.h diff --git a/SW_Model.h b/include/SW_Model.h similarity index 100% rename from SW_Model.h rename to include/SW_Model.h diff --git a/SW_Output.h b/include/SW_Output.h similarity index 100% rename from SW_Output.h rename to include/SW_Output.h diff --git a/SW_Output_outarray.h b/include/SW_Output_outarray.h similarity index 100% rename from SW_Output_outarray.h rename to include/SW_Output_outarray.h diff --git a/SW_Output_outtext.h b/include/SW_Output_outtext.h similarity index 100% rename from SW_Output_outtext.h rename to include/SW_Output_outtext.h diff --git a/SW_Site.h b/include/SW_Site.h similarity index 100% rename from SW_Site.h rename to include/SW_Site.h diff --git a/SW_Sky.h b/include/SW_Sky.h similarity index 100% rename from SW_Sky.h rename to include/SW_Sky.h diff --git a/SW_SoilWater.h b/include/SW_SoilWater.h similarity index 100% rename from SW_SoilWater.h rename to include/SW_SoilWater.h diff --git a/SW_Times.h b/include/SW_Times.h similarity index 100% rename from SW_Times.h rename to include/SW_Times.h diff --git a/SW_VegEstab.h b/include/SW_VegEstab.h similarity index 100% rename from SW_VegEstab.h rename to include/SW_VegEstab.h diff --git a/SW_VegProd.h b/include/SW_VegProd.h similarity index 100% rename from SW_VegProd.h rename to include/SW_VegProd.h diff --git a/SW_Weather.h b/include/SW_Weather.h similarity index 100% rename from SW_Weather.h rename to include/SW_Weather.h diff --git a/Times.h b/include/Times.h similarity index 100% rename from Times.h rename to include/Times.h diff --git a/filefuncs.h b/include/filefuncs.h similarity index 100% rename from filefuncs.h rename to include/filefuncs.h diff --git a/generic.h b/include/generic.h similarity index 100% rename from generic.h rename to include/generic.h diff --git a/memblock.h b/include/memblock.h similarity index 100% rename from memblock.h rename to include/memblock.h diff --git a/myMemory.h b/include/myMemory.h similarity index 100% rename from myMemory.h rename to include/myMemory.h diff --git a/rands.h b/include/rands.h similarity index 100% rename from rands.h rename to include/rands.h diff --git a/SW_Carbon.c b/src/SW_Carbon.c similarity index 100% rename from SW_Carbon.c rename to src/SW_Carbon.c diff --git a/SW_Control.c b/src/SW_Control.c similarity index 100% rename from SW_Control.c rename to src/SW_Control.c diff --git a/SW_Files.c b/src/SW_Files.c similarity index 100% rename from SW_Files.c rename to src/SW_Files.c diff --git a/SW_Flow.c b/src/SW_Flow.c similarity index 100% rename from SW_Flow.c rename to src/SW_Flow.c diff --git a/SW_Flow_lib.c b/src/SW_Flow_lib.c similarity index 100% rename from SW_Flow_lib.c rename to src/SW_Flow_lib.c diff --git a/SW_Flow_lib_PET.c b/src/SW_Flow_lib_PET.c similarity index 100% rename from SW_Flow_lib_PET.c rename to src/SW_Flow_lib_PET.c diff --git a/SW_Main.c b/src/SW_Main.c similarity index 100% rename from SW_Main.c rename to src/SW_Main.c diff --git a/SW_Main_lib.c b/src/SW_Main_lib.c similarity index 100% rename from SW_Main_lib.c rename to src/SW_Main_lib.c diff --git a/SW_Markov.c b/src/SW_Markov.c similarity index 100% rename from SW_Markov.c rename to src/SW_Markov.c diff --git a/SW_Model.c b/src/SW_Model.c similarity index 100% rename from SW_Model.c rename to src/SW_Model.c diff --git a/SW_Output.c b/src/SW_Output.c similarity index 100% rename from SW_Output.c rename to src/SW_Output.c diff --git a/SW_Output_get_functions.c b/src/SW_Output_get_functions.c similarity index 100% rename from SW_Output_get_functions.c rename to src/SW_Output_get_functions.c diff --git a/SW_Output_mock.c b/src/SW_Output_mock.c similarity index 100% rename from SW_Output_mock.c rename to src/SW_Output_mock.c diff --git a/SW_Output_outarray.c b/src/SW_Output_outarray.c similarity index 100% rename from SW_Output_outarray.c rename to src/SW_Output_outarray.c diff --git a/SW_Output_outtext.c b/src/SW_Output_outtext.c similarity index 100% rename from SW_Output_outtext.c rename to src/SW_Output_outtext.c diff --git a/SW_Site.c b/src/SW_Site.c similarity index 100% rename from SW_Site.c rename to src/SW_Site.c diff --git a/SW_Sky.c b/src/SW_Sky.c similarity index 100% rename from SW_Sky.c rename to src/SW_Sky.c diff --git a/SW_SoilWater.c b/src/SW_SoilWater.c similarity index 100% rename from SW_SoilWater.c rename to src/SW_SoilWater.c diff --git a/SW_VegEstab.c b/src/SW_VegEstab.c similarity index 100% rename from SW_VegEstab.c rename to src/SW_VegEstab.c diff --git a/SW_VegProd.c b/src/SW_VegProd.c similarity index 100% rename from SW_VegProd.c rename to src/SW_VegProd.c diff --git a/SW_Weather.c b/src/SW_Weather.c similarity index 100% rename from SW_Weather.c rename to src/SW_Weather.c diff --git a/Times.c b/src/Times.c similarity index 100% rename from Times.c rename to src/Times.c diff --git a/filefuncs.c b/src/filefuncs.c similarity index 100% rename from filefuncs.c rename to src/filefuncs.c diff --git a/generic.c b/src/generic.c similarity index 100% rename from generic.c rename to src/generic.c diff --git a/mymemory.c b/src/mymemory.c similarity index 100% rename from mymemory.c rename to src/mymemory.c diff --git a/rands.c b/src/rands.c similarity index 100% rename from rands.c rename to src/rands.c diff --git a/testing/Input/bouteloua.estab b/tests/example/Input/bouteloua.estab similarity index 100% rename from testing/Input/bouteloua.estab rename to tests/example/Input/bouteloua.estab diff --git a/testing/Input/bromus.estab b/tests/example/Input/bromus.estab similarity index 100% rename from testing/Input/bromus.estab rename to tests/example/Input/bromus.estab diff --git a/testing/Input/carbon.in b/tests/example/Input/carbon.in similarity index 100% rename from testing/Input/carbon.in rename to tests/example/Input/carbon.in diff --git a/testing/Input/climate.in b/tests/example/Input/climate.in similarity index 100% rename from testing/Input/climate.in rename to tests/example/Input/climate.in diff --git a/testing/Input/data_weather/weath.1980 b/tests/example/Input/data_weather/weath.1980 similarity index 100% rename from testing/Input/data_weather/weath.1980 rename to tests/example/Input/data_weather/weath.1980 diff --git a/testing/Input/data_weather/weath.1981 b/tests/example/Input/data_weather/weath.1981 similarity index 100% rename from testing/Input/data_weather/weath.1981 rename to tests/example/Input/data_weather/weath.1981 diff --git a/testing/Input/data_weather/weath.1982 b/tests/example/Input/data_weather/weath.1982 similarity index 100% rename from testing/Input/data_weather/weath.1982 rename to tests/example/Input/data_weather/weath.1982 diff --git a/testing/Input/data_weather/weath.1983 b/tests/example/Input/data_weather/weath.1983 similarity index 100% rename from testing/Input/data_weather/weath.1983 rename to tests/example/Input/data_weather/weath.1983 diff --git a/testing/Input/data_weather/weath.1984 b/tests/example/Input/data_weather/weath.1984 similarity index 100% rename from testing/Input/data_weather/weath.1984 rename to tests/example/Input/data_weather/weath.1984 diff --git a/testing/Input/data_weather/weath.1985 b/tests/example/Input/data_weather/weath.1985 similarity index 100% rename from testing/Input/data_weather/weath.1985 rename to tests/example/Input/data_weather/weath.1985 diff --git a/testing/Input/data_weather/weath.1986 b/tests/example/Input/data_weather/weath.1986 similarity index 100% rename from testing/Input/data_weather/weath.1986 rename to tests/example/Input/data_weather/weath.1986 diff --git a/testing/Input/data_weather/weath.1987 b/tests/example/Input/data_weather/weath.1987 similarity index 100% rename from testing/Input/data_weather/weath.1987 rename to tests/example/Input/data_weather/weath.1987 diff --git a/testing/Input/data_weather/weath.1988 b/tests/example/Input/data_weather/weath.1988 similarity index 100% rename from testing/Input/data_weather/weath.1988 rename to tests/example/Input/data_weather/weath.1988 diff --git a/testing/Input/data_weather/weath.1989 b/tests/example/Input/data_weather/weath.1989 similarity index 100% rename from testing/Input/data_weather/weath.1989 rename to tests/example/Input/data_weather/weath.1989 diff --git a/testing/Input/data_weather/weath.1990 b/tests/example/Input/data_weather/weath.1990 similarity index 100% rename from testing/Input/data_weather/weath.1990 rename to tests/example/Input/data_weather/weath.1990 diff --git a/testing/Input/data_weather/weath.1991 b/tests/example/Input/data_weather/weath.1991 similarity index 100% rename from testing/Input/data_weather/weath.1991 rename to tests/example/Input/data_weather/weath.1991 diff --git a/testing/Input/data_weather/weath.1992 b/tests/example/Input/data_weather/weath.1992 similarity index 100% rename from testing/Input/data_weather/weath.1992 rename to tests/example/Input/data_weather/weath.1992 diff --git a/testing/Input/data_weather/weath.1993 b/tests/example/Input/data_weather/weath.1993 similarity index 100% rename from testing/Input/data_weather/weath.1993 rename to tests/example/Input/data_weather/weath.1993 diff --git a/testing/Input/data_weather/weath.1994 b/tests/example/Input/data_weather/weath.1994 similarity index 100% rename from testing/Input/data_weather/weath.1994 rename to tests/example/Input/data_weather/weath.1994 diff --git a/testing/Input/data_weather/weath.1995 b/tests/example/Input/data_weather/weath.1995 similarity index 100% rename from testing/Input/data_weather/weath.1995 rename to tests/example/Input/data_weather/weath.1995 diff --git a/testing/Input/data_weather/weath.1996 b/tests/example/Input/data_weather/weath.1996 similarity index 100% rename from testing/Input/data_weather/weath.1996 rename to tests/example/Input/data_weather/weath.1996 diff --git a/testing/Input/data_weather/weath.1997 b/tests/example/Input/data_weather/weath.1997 similarity index 100% rename from testing/Input/data_weather/weath.1997 rename to tests/example/Input/data_weather/weath.1997 diff --git a/testing/Input/data_weather/weath.1998 b/tests/example/Input/data_weather/weath.1998 similarity index 100% rename from testing/Input/data_weather/weath.1998 rename to tests/example/Input/data_weather/weath.1998 diff --git a/testing/Input/data_weather/weath.1999 b/tests/example/Input/data_weather/weath.1999 similarity index 100% rename from testing/Input/data_weather/weath.1999 rename to tests/example/Input/data_weather/weath.1999 diff --git a/testing/Input/data_weather/weath.2000 b/tests/example/Input/data_weather/weath.2000 similarity index 100% rename from testing/Input/data_weather/weath.2000 rename to tests/example/Input/data_weather/weath.2000 diff --git a/testing/Input/data_weather/weath.2001 b/tests/example/Input/data_weather/weath.2001 similarity index 100% rename from testing/Input/data_weather/weath.2001 rename to tests/example/Input/data_weather/weath.2001 diff --git a/testing/Input/data_weather/weath.2002 b/tests/example/Input/data_weather/weath.2002 similarity index 100% rename from testing/Input/data_weather/weath.2002 rename to tests/example/Input/data_weather/weath.2002 diff --git a/testing/Input/data_weather/weath.2003 b/tests/example/Input/data_weather/weath.2003 similarity index 100% rename from testing/Input/data_weather/weath.2003 rename to tests/example/Input/data_weather/weath.2003 diff --git a/testing/Input/data_weather/weath.2004 b/tests/example/Input/data_weather/weath.2004 similarity index 100% rename from testing/Input/data_weather/weath.2004 rename to tests/example/Input/data_weather/weath.2004 diff --git a/testing/Input/data_weather/weath.2005 b/tests/example/Input/data_weather/weath.2005 similarity index 100% rename from testing/Input/data_weather/weath.2005 rename to tests/example/Input/data_weather/weath.2005 diff --git a/testing/Input/data_weather/weath.2006 b/tests/example/Input/data_weather/weath.2006 similarity index 100% rename from testing/Input/data_weather/weath.2006 rename to tests/example/Input/data_weather/weath.2006 diff --git a/testing/Input/data_weather/weath.2007 b/tests/example/Input/data_weather/weath.2007 similarity index 100% rename from testing/Input/data_weather/weath.2007 rename to tests/example/Input/data_weather/weath.2007 diff --git a/testing/Input/data_weather/weath.2008 b/tests/example/Input/data_weather/weath.2008 similarity index 100% rename from testing/Input/data_weather/weath.2008 rename to tests/example/Input/data_weather/weath.2008 diff --git a/testing/Input/data_weather/weath.2009 b/tests/example/Input/data_weather/weath.2009 similarity index 100% rename from testing/Input/data_weather/weath.2009 rename to tests/example/Input/data_weather/weath.2009 diff --git a/testing/Input/data_weather/weath.2010 b/tests/example/Input/data_weather/weath.2010 similarity index 100% rename from testing/Input/data_weather/weath.2010 rename to tests/example/Input/data_weather/weath.2010 diff --git a/testing/Input/data_weather_missing/weath.1980 b/tests/example/Input/data_weather_missing/weath.1980 similarity index 100% rename from testing/Input/data_weather_missing/weath.1980 rename to tests/example/Input/data_weather_missing/weath.1980 diff --git a/testing/Input/data_weather_missing/weath.2010 b/tests/example/Input/data_weather_missing/weath.2010 similarity index 100% rename from testing/Input/data_weather_missing/weath.2010 rename to tests/example/Input/data_weather_missing/weath.2010 diff --git a/testing/Input/estab.in b/tests/example/Input/estab.in similarity index 100% rename from testing/Input/estab.in rename to tests/example/Input/estab.in diff --git a/testing/Input/mkv_covar.in b/tests/example/Input/mkv_covar.in similarity index 100% rename from testing/Input/mkv_covar.in rename to tests/example/Input/mkv_covar.in diff --git a/testing/Input/mkv_prob.in b/tests/example/Input/mkv_prob.in similarity index 100% rename from testing/Input/mkv_prob.in rename to tests/example/Input/mkv_prob.in diff --git a/testing/Input/outsetup.in b/tests/example/Input/outsetup.in similarity index 100% rename from testing/Input/outsetup.in rename to tests/example/Input/outsetup.in diff --git a/testing/Input/siteparam.in b/tests/example/Input/siteparam.in similarity index 100% rename from testing/Input/siteparam.in rename to tests/example/Input/siteparam.in diff --git a/testing/Input/soils.in b/tests/example/Input/soils.in similarity index 100% rename from testing/Input/soils.in rename to tests/example/Input/soils.in diff --git a/testing/Input/swcsetup.in b/tests/example/Input/swcsetup.in similarity index 100% rename from testing/Input/swcsetup.in rename to tests/example/Input/swcsetup.in diff --git a/testing/Input/swrc_params.in b/tests/example/Input/swrc_params.in similarity index 100% rename from testing/Input/swrc_params.in rename to tests/example/Input/swrc_params.in diff --git a/testing/Input/swrc_params_FXW.in b/tests/example/Input/swrc_params_FXW.in similarity index 100% rename from testing/Input/swrc_params_FXW.in rename to tests/example/Input/swrc_params_FXW.in diff --git a/testing/Input/swrc_params_vanGenuchten1980.in b/tests/example/Input/swrc_params_vanGenuchten1980.in similarity index 100% rename from testing/Input/swrc_params_vanGenuchten1980.in rename to tests/example/Input/swrc_params_vanGenuchten1980.in diff --git a/testing/Input/veg.in b/tests/example/Input/veg.in similarity index 100% rename from testing/Input/veg.in rename to tests/example/Input/veg.in diff --git a/testing/Input/weathsetup.in b/tests/example/Input/weathsetup.in similarity index 100% rename from testing/Input/weathsetup.in rename to tests/example/Input/weathsetup.in diff --git a/testing/Input/years.in b/tests/example/Input/years.in similarity index 100% rename from testing/Input/years.in rename to tests/example/Input/years.in diff --git a/testing/Output/.gitignore b/tests/example/Output/.gitignore similarity index 100% rename from testing/Output/.gitignore rename to tests/example/Output/.gitignore diff --git a/testing/README.md b/tests/example/README.md similarity index 100% rename from testing/README.md rename to tests/example/README.md diff --git a/testing/files.in b/tests/example/files.in similarity index 100% rename from testing/files.in rename to tests/example/files.in diff --git a/test/sw_maintest.cc b/tests/gtests/sw_maintest.cc similarity index 100% rename from test/sw_maintest.cc rename to tests/gtests/sw_maintest.cc diff --git a/test/sw_testhelpers.cc b/tests/gtests/sw_testhelpers.cc similarity index 100% rename from test/sw_testhelpers.cc rename to tests/gtests/sw_testhelpers.cc diff --git a/test/sw_testhelpers.h b/tests/gtests/sw_testhelpers.h similarity index 100% rename from test/sw_testhelpers.h rename to tests/gtests/sw_testhelpers.h diff --git a/test/test_SW_Carbon.cc b/tests/gtests/test_SW_Carbon.cc similarity index 100% rename from test/test_SW_Carbon.cc rename to tests/gtests/test_SW_Carbon.cc diff --git a/test/test_SW_Defines.cc b/tests/gtests/test_SW_Defines.cc similarity index 100% rename from test/test_SW_Defines.cc rename to tests/gtests/test_SW_Defines.cc diff --git a/test/test_SW_Flow_Lib.cc b/tests/gtests/test_SW_Flow_Lib.cc similarity index 100% rename from test/test_SW_Flow_Lib.cc rename to tests/gtests/test_SW_Flow_Lib.cc diff --git a/test/test_SW_Flow_Lib_PET.cc b/tests/gtests/test_SW_Flow_Lib_PET.cc similarity index 100% rename from test/test_SW_Flow_Lib_PET.cc rename to tests/gtests/test_SW_Flow_Lib_PET.cc diff --git a/test/test_SW_Flow_lib_temp.cc b/tests/gtests/test_SW_Flow_lib_temp.cc similarity index 100% rename from test/test_SW_Flow_lib_temp.cc rename to tests/gtests/test_SW_Flow_lib_temp.cc diff --git a/test/test_SW_Markov.cc b/tests/gtests/test_SW_Markov.cc similarity index 100% rename from test/test_SW_Markov.cc rename to tests/gtests/test_SW_Markov.cc diff --git a/test/test_SW_Site.cc b/tests/gtests/test_SW_Site.cc similarity index 100% rename from test/test_SW_Site.cc rename to tests/gtests/test_SW_Site.cc diff --git a/test/test_SW_SoilWater.cc b/tests/gtests/test_SW_SoilWater.cc similarity index 100% rename from test/test_SW_SoilWater.cc rename to tests/gtests/test_SW_SoilWater.cc diff --git a/test/test_SW_VegProd.cc b/tests/gtests/test_SW_VegProd.cc similarity index 100% rename from test/test_SW_VegProd.cc rename to tests/gtests/test_SW_VegProd.cc diff --git a/test/test_SW_Weather.cc b/tests/gtests/test_SW_Weather.cc similarity index 100% rename from test/test_SW_Weather.cc rename to tests/gtests/test_SW_Weather.cc diff --git a/test/test_Times.cc b/tests/gtests/test_Times.cc similarity index 100% rename from test/test_Times.cc rename to tests/gtests/test_Times.cc diff --git a/test/test_WaterBalance.cc b/tests/gtests/test_WaterBalance.cc similarity index 100% rename from test/test_WaterBalance.cc rename to tests/gtests/test_WaterBalance.cc diff --git a/test/test_generic.cc b/tests/gtests/test_generic.cc similarity index 100% rename from test/test_generic.cc rename to tests/gtests/test_generic.cc diff --git a/test/test_rands.cc b/tests/gtests/test_rands.cc similarity index 100% rename from test/test_rands.cc rename to tests/gtests/test_rands.cc