Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt new project file structure #52

Merged

Conversation

soaressgabriel
Copy link
Collaborator

@soaressgabriel soaressgabriel commented Sep 7, 2021

The proposed new structure of the model configuration file is as follows:

[SIM_TIME]
start = 01/01/2000
end = 01/02/2000

# Data input and output directories along with 
# directories containing raster series have been 
# relocated to this portion of the configuration file
[DIRECTORIES]
input = //Dataset/UIGCRB/
output = //Dataset/UIGCRB/out/
etp = //Dataset/UIGCRB/base/maps/etp/
prec = //Dataset/UIGCRB/base/maps/prec/
ndvi = //Dataset/UIGCRB/base/maps/ndvi/
Kp = //Dataset/UIGCRB/base/maps/kp/
landuse = //Dataset/UIGCRB/base/maps/landuse/

# The prefixes of the raster series file names 
# have been relocated to this section of the file
# Also, some sections of this option have been renamed
[FILENAME_PREFIXES]
etp_prefix = etp
prec_prefix = prec
ndvi_prefix = ndvi
kp_prefix = kp
landuse_prefix = cov

# The FILES option has been renamed to RASTER
# Also, some sections of this option have been renamed
[RASTERS]
dem = //Dataset/UIGCRB/base/maps/dem/dem.map
demtif = //Dataset/UIGCRB/base/maps/dem/dem.tif
clone = //Dataset/UIGCRB/base/maps/clone/clone.map
ndvi_max = //Dataset/UIGCRB/base/maps/ndvi/ndvi_max.map
ndvi_min = //Dataset/UIGCRB/base/maps/ndvi/ndvi_min.map
soil = //Dataset/UIGCRB/base/maps/soil/soil.map
samples = //Dataset/UIGCRB/base/maps/samples/samples.map

# The PARAMETERS option has been renamed to TABLES
[TABLES]
# Also, some sections of this option have been renamed
rainydays = //Dataset/UIGCRB/base/tables/rainydays.txt
a_i = //Dataset/UIGCRB/base/tables/cov/a_i.txt
a_o = //Dataset/UIGCRB/base/tables/cov/a_o.txt
a_s = //Dataset/UIGCRB/base/tables/cov/a_s.txt
a_v = //Dataset/UIGCRB/base/tables/cov/a_v.txt
manning = //Dataset/UIGCRB/base/tables/cov/manning.txt
bulk_density = //Dataset/UIGCRB/base/tables/soil/dg.txt
K_sat = //Dataset/UIGCRB/base/tables/soil/Kr.txt
T_fcap = //Dataset/UIGCRB/base/tables/soil/Tcc.txt
T_sat = //Dataset/UIGCRB/base/tables/soil/Tsat.txt
T_wp = //Dataset/UIGCRB/base/tables/soil/Tw.txt
rootzone_depth = //Dataset/UIGCRB/base/tables/soil/Zr.txt
K_c_min = //Dataset/UIGCRB/base/tables/cov/kcmin.txt
K_c_max = //Dataset/UIGCRB/base/tables/cov/kcmax.txt

[GRID]
grid = 500.0

# Some sections of this option have been renamed
[CALIBRATION]
alpha = 4.5
b = 0.5
w_1 = 0.333
w_2 = 0.333
w_3 = 0.334
rcd = 5.0
f = 0.5
alpha_gw = 0.5
x = 0.5

# The INITIAL SOIL CONDITIONS option has been 
# renamed to INITIAL_SOIL_CONDITIONS
# Also, some sections of this option have been renamed
[INITIAL_SOIL_CONDITIONS]
T_ini = 1.0
bfw_ini = 0.1
bfw_lim = 1.0
S_sat_ini = 1.0

# The CONSTANT option has been renamed to CONSTANTS
[CONSTANTS]
fpar_max = 0.95
fpar_min = 0.001
lai_max = 12.0
i_imp = 2.5

# Some sections of this option have been renamed
[GENERATE_FILE]
itp = True
bfw = True
srn = True
eta = True
lfw = True
rec = True
smc = True
rnf = True
tss = True

# The GENERATE_FILE_FORMAT option has been renamed 
# to RASTER_FILE_FORMAT
# Also, some sections of this option have been renamed
[RASTER_FILE_FORMAT]
map_raster_series = True
tiff_raster_series = True

@soaressgabriel soaressgabriel self-assigned this Sep 7, 2021
@soaressgabriel soaressgabriel added the enhancement New feature or request label Sep 7, 2021
@soaressgabriel soaressgabriel linked an issue Sep 7, 2021 that may be closed by this pull request
@LINAMARIAOSORIO
Copy link
Collaborator

  • Remove "T_por" line

@soaressgabriel
Copy link
Collaborator Author

Oops, this parameter had already been removed in PR #44 and I ended up using an older configuration file to write this PR message describing my proposition.

I just corrected the description message of this PR.

@LINAMARIAOSORIO LINAMARIAOSORIO merged commit eaca4a8 into development Sep 10, 2021
@soaressgabriel soaressgabriel changed the title Update config file with EN naming Adopt new project file structure Nov 22, 2021
@soaressgabriel soaressgabriel deleted the 8-refatorar-cdigo-para-contemplar-nomenc branch November 26, 2021 13:55
@soaressgabriel soaressgabriel added this to the v0.1.0 milestone Feb 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor code to accommodate updated nomenclature
2 participants