Fix conflicting gitignore

hectornieto · Feb 12, 2021 · 78df401 · 78df401
2 parents ada6a1a + 0a8715d
commit 78df401
Show file tree

Hide file tree

Showing 30 changed files with 3,752 additions and 1,392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,14 +67,19 @@ target/
 
 # Auxiliary image files
 *.tif.*
-Output/*.tif.*
 Input/*.tif.*
 
+# Ignore output files
+Output/
+!Output/ExampleTableOutput.txt
+
 # Jupyter Notebooks Checkpoints
 .ipynb_checkpoints/
 
 #Ipython Notebook
 .ipynb_checkpoints
 
-.idea*
+# PyCharm
+.idea/*
+
 
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/pyTSEB.iml b/.idea/pyTSEB.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Config_LocalImage.txt b/Config_LocalImage.txt
@@ -103,7 +103,7 @@ leaf_width=0.1
 #==============================================================================
 resistance_form=0   # Resistance formulations: 0 - Kustas & Norman 1999; 1 - Choudhury & Monteih 1998; 2 - McNaughton & Van der Hurk 1995
 KN_b=0.012          # Kustas & Norman formulation parameter
-KN_c=0.0025         # Kustas & Norman formulation parameter
+KN_c=0.0038         # Kustas & Norman formulation parameter
 KN_C_dash=90       # Kustas & Norman formulation parameter
 
 

diff --git a/Config_PointTimeSeries.txt b/Config_PointTimeSeries.txt
@@ -13,8 +13,8 @@ model=TSEB_PT
 # Temperatures are in Celsius, angles are in degrees, presure are in mb. u: wind speed, ea: vapour prssure, Sdn: incoming solar radiation
 # Additional input variables are: 'SAA': solar azimuth angle, 'SZA': solar zenith angle, 'Ldn': incoming longwave radiation, 'f_C': fractional cover, 'f_g': green fraction, 'wc': canopy width to height ratio, 'G': soil heat flux (see G_Calc flag below)
 # Other variables included (accidentaly or on purpose) in the text file are ignored
-
-input_file=./Input/ExampleTableInput.txt# mandatory file
+# mandatory file
+input_file=./Input/ExampleTableInput.txt
 
 #==============================================================================
 # Output paramters
@@ -65,7 +65,7 @@ w_C=1 # Canopy width to height ratio
 #==============================================================================
 resistance_form=0   # Resistance formulations: 0 - Kustas & Norman 1999; 1 - Choudhury & Monteih 1998; 2 - McNaughton & Van der Hurk 1995
 KN_b=0.012          # Kustas & Norman formulation parameter
-KN_c=0.0025         # Kustas & Norman formulation parameter
+KN_c=0.0038         # Kustas & Norman formulation parameter
 KN_C_dash=90       # Kustas & Norman formulation parameter
 
 #==============================================================================

diff --git a/Output/test_image.tif b/Output/test_image.tif
diff --git a/Output/test_image_ancillary.tif b/Output/test_image_ancillary.tif