Re-organize repository (part 1)

- addressing #89 - `git mv previous_path target_path` to "rename" folders and files without losing git history - external: googletest and pcg submodules - src: SOILWAT2 source code - include: SOILWAT2 header files - tests/example: example inputs for a SOILWAT2 run, previously "testing" - tests/gtests: unit tests based on googletest, previously "test" - note: additional commits to complete #89 will need to update file path names, makefile, etc.
DrylandEcology · Dec 21, 2022 · 90b1741 · 90b1741
1 parent a6c367a
commit 90b1741
Show file tree

Hide file tree

Showing 126 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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 → external/googletest b/googletest → external/googletest
diff --git a/pcg → external/pcg b/pcg → external/pcg
diff --git a/SW_Carbon.h → include/SW_Carbon.h b/SW_Carbon.h → include/SW_Carbon.h
diff --git a/SW_Control.h → include/SW_Control.h b/SW_Control.h → include/SW_Control.h
diff --git a/SW_Defines.h → include/SW_Defines.h b/SW_Defines.h → include/SW_Defines.h
diff --git a/SW_Files.h → include/SW_Files.h b/SW_Files.h → include/SW_Files.h
diff --git a/SW_Flow.h → include/SW_Flow.h b/SW_Flow.h → include/SW_Flow.h
diff --git a/SW_Flow_lib.h → include/SW_Flow_lib.h b/SW_Flow_lib.h → include/SW_Flow_lib.h
diff --git a/SW_Flow_lib_PET.h → include/SW_Flow_lib_PET.h b/SW_Flow_lib_PET.h → include/SW_Flow_lib_PET.h
diff --git a/SW_Main_lib.h → include/SW_Main_lib.h b/SW_Main_lib.h → include/SW_Main_lib.h
diff --git a/SW_Markov.h → include/SW_Markov.h b/SW_Markov.h → include/SW_Markov.h
diff --git a/SW_Model.h → include/SW_Model.h b/SW_Model.h → include/SW_Model.h
diff --git a/SW_Output.h → include/SW_Output.h b/SW_Output.h → include/SW_Output.h
diff --git a/SW_Output_outarray.h → include/SW_Output_outarray.h b/SW_Output_outarray.h → include/SW_Output_outarray.h
diff --git a/SW_Output_outtext.h → include/SW_Output_outtext.h b/SW_Output_outtext.h → include/SW_Output_outtext.h
diff --git a/SW_Site.h → include/SW_Site.h b/SW_Site.h → include/SW_Site.h
diff --git a/SW_Sky.h → include/SW_Sky.h b/SW_Sky.h → include/SW_Sky.h
diff --git a/SW_SoilWater.h → include/SW_SoilWater.h b/SW_SoilWater.h → include/SW_SoilWater.h
diff --git a/SW_Times.h → include/SW_Times.h b/SW_Times.h → include/SW_Times.h
diff --git a/SW_VegEstab.h → include/SW_VegEstab.h b/SW_VegEstab.h → include/SW_VegEstab.h
diff --git a/SW_VegProd.h → include/SW_VegProd.h b/SW_VegProd.h → include/SW_VegProd.h
diff --git a/SW_Weather.h → include/SW_Weather.h b/SW_Weather.h → include/SW_Weather.h
diff --git a/Times.h → include/Times.h b/Times.h → include/Times.h
diff --git a/filefuncs.h → include/filefuncs.h b/filefuncs.h → include/filefuncs.h
diff --git a/generic.h → include/generic.h b/generic.h → include/generic.h
diff --git a/memblock.h → include/memblock.h b/memblock.h → include/memblock.h
diff --git a/myMemory.h → include/myMemory.h b/myMemory.h → include/myMemory.h
diff --git a/rands.h → include/rands.h b/rands.h → include/rands.h
diff --git a/SW_Carbon.c → src/SW_Carbon.c b/SW_Carbon.c → src/SW_Carbon.c
diff --git a/SW_Control.c → src/SW_Control.c b/SW_Control.c → src/SW_Control.c
diff --git a/SW_Files.c → src/SW_Files.c b/SW_Files.c → src/SW_Files.c
diff --git a/SW_Flow.c → src/SW_Flow.c b/SW_Flow.c → src/SW_Flow.c
diff --git a/SW_Flow_lib.c → src/SW_Flow_lib.c b/SW_Flow_lib.c → src/SW_Flow_lib.c
diff --git a/SW_Flow_lib_PET.c → src/SW_Flow_lib_PET.c b/SW_Flow_lib_PET.c → src/SW_Flow_lib_PET.c
diff --git a/SW_Main.c → src/SW_Main.c b/SW_Main.c → src/SW_Main.c
diff --git a/SW_Main_lib.c → src/SW_Main_lib.c b/SW_Main_lib.c → src/SW_Main_lib.c
diff --git a/SW_Markov.c → src/SW_Markov.c b/SW_Markov.c → src/SW_Markov.c
diff --git a/SW_Model.c → src/SW_Model.c b/SW_Model.c → src/SW_Model.c
diff --git a/SW_Output.c → src/SW_Output.c b/SW_Output.c → src/SW_Output.c
diff --git a/SW_Output_get_functions.c → src/SW_Output_get_functions.c b/SW_Output_get_functions.c → src/SW_Output_get_functions.c
diff --git a/SW_Output_mock.c → src/SW_Output_mock.c b/SW_Output_mock.c → src/SW_Output_mock.c
diff --git a/SW_Output_outarray.c → src/SW_Output_outarray.c b/SW_Output_outarray.c → src/SW_Output_outarray.c
diff --git a/SW_Output_outtext.c → src/SW_Output_outtext.c b/SW_Output_outtext.c → src/SW_Output_outtext.c
diff --git a/SW_Site.c → src/SW_Site.c b/SW_Site.c → src/SW_Site.c
diff --git a/SW_Sky.c → src/SW_Sky.c b/SW_Sky.c → src/SW_Sky.c
diff --git a/SW_SoilWater.c → src/SW_SoilWater.c b/SW_SoilWater.c → src/SW_SoilWater.c
diff --git a/SW_VegEstab.c → src/SW_VegEstab.c b/SW_VegEstab.c → src/SW_VegEstab.c
diff --git a/SW_VegProd.c → src/SW_VegProd.c b/SW_VegProd.c → src/SW_VegProd.c
diff --git a/SW_Weather.c → src/SW_Weather.c b/SW_Weather.c → src/SW_Weather.c
diff --git a/Times.c → src/Times.c b/Times.c → src/Times.c
diff --git a/filefuncs.c → src/filefuncs.c b/filefuncs.c → src/filefuncs.c
diff --git a/generic.c → src/generic.c b/generic.c → src/generic.c
diff --git a/mymemory.c → src/mymemory.c b/mymemory.c → src/mymemory.c
diff --git a/rands.c → src/rands.c b/rands.c → src/rands.c
diff --git a/testing/Input/bouteloua.estab → tests/example/Input/bouteloua.estab b/testing/Input/bouteloua.estab → tests/example/Input/bouteloua.estab
diff --git a/testing/Input/bromus.estab → tests/example/Input/bromus.estab b/testing/Input/bromus.estab → tests/example/Input/bromus.estab
diff --git a/testing/Input/carbon.in → tests/example/Input/carbon.in b/testing/Input/carbon.in → tests/example/Input/carbon.in
diff --git a/testing/Input/climate.in → tests/example/Input/climate.in b/testing/Input/climate.in → tests/example/Input/climate.in
diff --git a/testing/Input/data_weather/weath.1980 → tests/example/Input/data_weather/weath.1980 b/testing/Input/data_weather/weath.1980 → tests/example/Input/data_weather/weath.1980
diff --git a/testing/Input/data_weather/weath.1981 → tests/example/Input/data_weather/weath.1981 b/testing/Input/data_weather/weath.1981 → tests/example/Input/data_weather/weath.1981
diff --git a/testing/Input/data_weather/weath.1982 → tests/example/Input/data_weather/weath.1982 b/testing/Input/data_weather/weath.1982 → tests/example/Input/data_weather/weath.1982
diff --git a/testing/Input/data_weather/weath.1983 → tests/example/Input/data_weather/weath.1983 b/testing/Input/data_weather/weath.1983 → tests/example/Input/data_weather/weath.1983
diff --git a/testing/Input/data_weather/weath.1984 → tests/example/Input/data_weather/weath.1984 b/testing/Input/data_weather/weath.1984 → tests/example/Input/data_weather/weath.1984
diff --git a/testing/Input/data_weather/weath.1985 → tests/example/Input/data_weather/weath.1985 b/testing/Input/data_weather/weath.1985 → tests/example/Input/data_weather/weath.1985
diff --git a/testing/Input/data_weather/weath.1986 → tests/example/Input/data_weather/weath.1986 b/testing/Input/data_weather/weath.1986 → tests/example/Input/data_weather/weath.1986
diff --git a/testing/Input/data_weather/weath.1987 → tests/example/Input/data_weather/weath.1987 b/testing/Input/data_weather/weath.1987 → tests/example/Input/data_weather/weath.1987
diff --git a/testing/Input/data_weather/weath.1988 → tests/example/Input/data_weather/weath.1988 b/testing/Input/data_weather/weath.1988 → tests/example/Input/data_weather/weath.1988
diff --git a/testing/Input/data_weather/weath.1989 → tests/example/Input/data_weather/weath.1989 b/testing/Input/data_weather/weath.1989 → tests/example/Input/data_weather/weath.1989
diff --git a/testing/Input/data_weather/weath.1990 → tests/example/Input/data_weather/weath.1990 b/testing/Input/data_weather/weath.1990 → tests/example/Input/data_weather/weath.1990
diff --git a/testing/Input/data_weather/weath.1991 → tests/example/Input/data_weather/weath.1991 b/testing/Input/data_weather/weath.1991 → tests/example/Input/data_weather/weath.1991
diff --git a/testing/Input/data_weather/weath.1992 → tests/example/Input/data_weather/weath.1992 b/testing/Input/data_weather/weath.1992 → tests/example/Input/data_weather/weath.1992
diff --git a/testing/Input/data_weather/weath.1993 → tests/example/Input/data_weather/weath.1993 b/testing/Input/data_weather/weath.1993 → tests/example/Input/data_weather/weath.1993
diff --git a/testing/Input/data_weather/weath.1994 → tests/example/Input/data_weather/weath.1994 b/testing/Input/data_weather/weath.1994 → tests/example/Input/data_weather/weath.1994
diff --git a/testing/Input/data_weather/weath.1995 → tests/example/Input/data_weather/weath.1995 b/testing/Input/data_weather/weath.1995 → tests/example/Input/data_weather/weath.1995
diff --git a/testing/Input/data_weather/weath.1996 → tests/example/Input/data_weather/weath.1996 b/testing/Input/data_weather/weath.1996 → tests/example/Input/data_weather/weath.1996
diff --git a/testing/Input/data_weather/weath.1997 → tests/example/Input/data_weather/weath.1997 b/testing/Input/data_weather/weath.1997 → tests/example/Input/data_weather/weath.1997
diff --git a/testing/Input/data_weather/weath.1998 → tests/example/Input/data_weather/weath.1998 b/testing/Input/data_weather/weath.1998 → tests/example/Input/data_weather/weath.1998
diff --git a/testing/Input/data_weather/weath.1999 → tests/example/Input/data_weather/weath.1999 b/testing/Input/data_weather/weath.1999 → tests/example/Input/data_weather/weath.1999
diff --git a/testing/Input/data_weather/weath.2000 → tests/example/Input/data_weather/weath.2000 b/testing/Input/data_weather/weath.2000 → tests/example/Input/data_weather/weath.2000
diff --git a/testing/Input/data_weather/weath.2001 → tests/example/Input/data_weather/weath.2001 b/testing/Input/data_weather/weath.2001 → tests/example/Input/data_weather/weath.2001
diff --git a/testing/Input/data_weather/weath.2002 → tests/example/Input/data_weather/weath.2002 b/testing/Input/data_weather/weath.2002 → tests/example/Input/data_weather/weath.2002
diff --git a/testing/Input/data_weather/weath.2003 → tests/example/Input/data_weather/weath.2003 b/testing/Input/data_weather/weath.2003 → tests/example/Input/data_weather/weath.2003
diff --git a/testing/Input/data_weather/weath.2004 → tests/example/Input/data_weather/weath.2004 b/testing/Input/data_weather/weath.2004 → tests/example/Input/data_weather/weath.2004
diff --git a/testing/Input/data_weather/weath.2005 → tests/example/Input/data_weather/weath.2005 b/testing/Input/data_weather/weath.2005 → tests/example/Input/data_weather/weath.2005
diff --git a/testing/Input/data_weather/weath.2006 → tests/example/Input/data_weather/weath.2006 b/testing/Input/data_weather/weath.2006 → tests/example/Input/data_weather/weath.2006
diff --git a/testing/Input/data_weather/weath.2007 → tests/example/Input/data_weather/weath.2007 b/testing/Input/data_weather/weath.2007 → tests/example/Input/data_weather/weath.2007
diff --git a/testing/Input/data_weather/weath.2008 → tests/example/Input/data_weather/weath.2008 b/testing/Input/data_weather/weath.2008 → tests/example/Input/data_weather/weath.2008
diff --git a/testing/Input/data_weather/weath.2009 → tests/example/Input/data_weather/weath.2009 b/testing/Input/data_weather/weath.2009 → tests/example/Input/data_weather/weath.2009
diff --git a/testing/Input/data_weather/weath.2010 → tests/example/Input/data_weather/weath.2010 b/testing/Input/data_weather/weath.2010 → tests/example/Input/data_weather/weath.2010
diff --git a/...ing/Input/data_weather_missing/weath.1980 → ...ple/Input/data_weather_missing/weath.1980 b/...ing/Input/data_weather_missing/weath.1980 → ...ple/Input/data_weather_missing/weath.1980
diff --git a/...ing/Input/data_weather_missing/weath.2010 → ...ple/Input/data_weather_missing/weath.2010 b/...ing/Input/data_weather_missing/weath.2010 → ...ple/Input/data_weather_missing/weath.2010
diff --git a/testing/Input/estab.in → tests/example/Input/estab.in b/testing/Input/estab.in → tests/example/Input/estab.in
diff --git a/testing/Input/mkv_covar.in → tests/example/Input/mkv_covar.in b/testing/Input/mkv_covar.in → tests/example/Input/mkv_covar.in
diff --git a/testing/Input/mkv_prob.in → tests/example/Input/mkv_prob.in b/testing/Input/mkv_prob.in → tests/example/Input/mkv_prob.in
diff --git a/testing/Input/outsetup.in → tests/example/Input/outsetup.in b/testing/Input/outsetup.in → tests/example/Input/outsetup.in
diff --git a/testing/Input/siteparam.in → tests/example/Input/siteparam.in b/testing/Input/siteparam.in → tests/example/Input/siteparam.in
diff --git a/testing/Input/soils.in → tests/example/Input/soils.in b/testing/Input/soils.in → tests/example/Input/soils.in
diff --git a/testing/Input/swcsetup.in → tests/example/Input/swcsetup.in b/testing/Input/swcsetup.in → tests/example/Input/swcsetup.in
diff --git a/testing/Input/swrc_params.in → tests/example/Input/swrc_params.in b/testing/Input/swrc_params.in → tests/example/Input/swrc_params.in
diff --git a/testing/Input/swrc_params_FXW.in → tests/example/Input/swrc_params_FXW.in b/testing/Input/swrc_params_FXW.in → tests/example/Input/swrc_params_FXW.in
diff --git a/...ing/Input/swrc_params_vanGenuchten1980.in → ...ple/Input/swrc_params_vanGenuchten1980.in b/...ing/Input/swrc_params_vanGenuchten1980.in → ...ple/Input/swrc_params_vanGenuchten1980.in
diff --git a/testing/Input/veg.in → tests/example/Input/veg.in b/testing/Input/veg.in → tests/example/Input/veg.in
diff --git a/testing/Input/weathsetup.in → tests/example/Input/weathsetup.in b/testing/Input/weathsetup.in → tests/example/Input/weathsetup.in
diff --git a/testing/Input/years.in → tests/example/Input/years.in b/testing/Input/years.in → tests/example/Input/years.in
diff --git a/testing/Output/.gitignore → tests/example/Output/.gitignore b/testing/Output/.gitignore → tests/example/Output/.gitignore
diff --git a/testing/README.md → tests/example/README.md b/testing/README.md → tests/example/README.md
diff --git a/testing/files.in → tests/example/files.in b/testing/files.in → tests/example/files.in
diff --git a/test/sw_maintest.cc → tests/gtests/sw_maintest.cc b/test/sw_maintest.cc → tests/gtests/sw_maintest.cc
diff --git a/test/sw_testhelpers.cc → tests/gtests/sw_testhelpers.cc b/test/sw_testhelpers.cc → tests/gtests/sw_testhelpers.cc
diff --git a/test/sw_testhelpers.h → tests/gtests/sw_testhelpers.h b/test/sw_testhelpers.h → tests/gtests/sw_testhelpers.h
diff --git a/test/test_SW_Carbon.cc → tests/gtests/test_SW_Carbon.cc b/test/test_SW_Carbon.cc → tests/gtests/test_SW_Carbon.cc
diff --git a/test/test_SW_Defines.cc → tests/gtests/test_SW_Defines.cc b/test/test_SW_Defines.cc → tests/gtests/test_SW_Defines.cc
diff --git a/test/test_SW_Flow_Lib.cc → tests/gtests/test_SW_Flow_Lib.cc b/test/test_SW_Flow_Lib.cc → tests/gtests/test_SW_Flow_Lib.cc
diff --git a/test/test_SW_Flow_Lib_PET.cc → tests/gtests/test_SW_Flow_Lib_PET.cc b/test/test_SW_Flow_Lib_PET.cc → tests/gtests/test_SW_Flow_Lib_PET.cc
diff --git a/test/test_SW_Flow_lib_temp.cc → tests/gtests/test_SW_Flow_lib_temp.cc b/test/test_SW_Flow_lib_temp.cc → tests/gtests/test_SW_Flow_lib_temp.cc
diff --git a/test/test_SW_Markov.cc → tests/gtests/test_SW_Markov.cc b/test/test_SW_Markov.cc → tests/gtests/test_SW_Markov.cc
diff --git a/test/test_SW_Site.cc → tests/gtests/test_SW_Site.cc b/test/test_SW_Site.cc → tests/gtests/test_SW_Site.cc
diff --git a/test/test_SW_SoilWater.cc → tests/gtests/test_SW_SoilWater.cc b/test/test_SW_SoilWater.cc → tests/gtests/test_SW_SoilWater.cc
diff --git a/test/test_SW_VegProd.cc → tests/gtests/test_SW_VegProd.cc b/test/test_SW_VegProd.cc → tests/gtests/test_SW_VegProd.cc
diff --git a/test/test_SW_Weather.cc → tests/gtests/test_SW_Weather.cc b/test/test_SW_Weather.cc → tests/gtests/test_SW_Weather.cc
diff --git a/test/test_Times.cc → tests/gtests/test_Times.cc b/test/test_Times.cc → tests/gtests/test_Times.cc
diff --git a/test/test_WaterBalance.cc → tests/gtests/test_WaterBalance.cc b/test/test_WaterBalance.cc → tests/gtests/test_WaterBalance.cc
diff --git a/test/test_generic.cc → tests/gtests/test_generic.cc b/test/test_generic.cc → tests/gtests/test_generic.cc
diff --git a/test/test_rands.cc → tests/gtests/test_rands.cc b/test/test_rands.cc → tests/gtests/test_rands.cc