Merge pull request #4 from holukas/adding-site-CH-FOR

Version info
holukas · Mar 27, 2024 · 1699a73 · 1699a73
2 parents 223bf25 + 940ae47
commit 1699a73
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ![](images/logo_FLUXRUN1_256px.png)
 
-## v1.4.1 | XX Mar 2024
+## v1.4.1 | 27 Mar 2024
 
 - Added new sites `CH-FOR`, `CH-HON` and `CH-TAN` in site selection menu
 - Now showing all sites when clicking on site selection drop-down menu

diff --git a/fluxrun/settings/FluxRun.settings b/fluxrun/settings/FluxRun.settings
@@ -1,4 +1,4 @@
-_run_id=FR-20240227-140551
+_run_id=FR-20240327-144235
 
 
 # INSTRUMENTS
@@ -12,50 +12,50 @@ site=CH-FRU
 # ==========
 
 ## Raw Data Source Folder
-rawdata_indir=F:/01-NEW/CH-FRU-FF202401/2023_rECord/raw_data_ascii_rECord_filesWithAGC/raw_data_ascii_rECord_filesWithAGC
-rawdata_file_compression=None
+rawdata_indir=F:/TMP
+rawdata_file_compression=gzip
 
 ## Time Range
 rawdata_start_date=2023-01-01 00:01
 rawdata_end_date=2023-12-31 23:59
 
 ## File Settings
-rawdata_filename_datetime_format=ec_yyyymmdd-HHMM_withAGC.dat
-_sitefiles_search_str=CH-FRU_*.dat
-_sitefiles_parse_str=CH-FRU_ec_%Y%m%d-%H%M_withAGC.dat
+rawdata_filename_datetime_format=yyyymmddHHMM
+_sitefiles_search_str=CH-FRU_*.csv.gz
+_sitefiles_parse_str=CH-FRU_%Y%m%d%H%M.csv.gz
 
 ## EddyPro
 path_selected_eddypro_processing_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.eddypro
-_path_used_eddypro_processing_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\ini\processing.eddypro
+_path_used_eddypro_processing_file=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\ini\processing.eddypro
 _path_found_eddypro_metadata_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.eddypro
-_path_used_eddypro_metadata_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\ini\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.metadata
-_path_used_eddypro_app_rp=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\bin\eddypro_rp.exe
-_path_used_eddypro_app_fcc=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\bin\eddypro_fcc.exe
+_path_used_eddypro_metadata_file=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\ini\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.metadata
+_path_used_eddypro_app_rp=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\bin\eddypro_rp.exe
+_path_used_eddypro_app_fcc=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\bin\eddypro_fcc.exe
 
 # OUTPUT
 # ======
 
 ## Output Folder
-dir_out=F:\01-NEW\CH-FRU-FF202401\2023_rECord
-_dir_out_run=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551
-_dir_out_run_log=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\0_log
-_dir_out_run_rawdata_ascii_files=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\1-0_rawdata_files_ascii
-_dir_used_rawdata_ascii_files_eddypro_data_path=F:/01-NEW/CH-FRU-FF202401/2023_rECord/raw_data_ascii_rECord_filesWithAGC/raw_data_ascii_rECord_filesWithAGC
-_dir_out_run_plots_availability_rawdata=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\1-1_rawdata_plots_availability
-_dir_out_run_plots_aggregates_rawdata=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\1-2_rawdata_plots_aggregates
-_dir_out_run_eddypro=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations
-_dir_out_run_eddypro_ini=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\ini
-_dir_out_run_eddypro_bin=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\bin
-_dir_out_run_eddypro_results=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\results
-_dir_out_run_plots_summary=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-1_eddypro_flux_calculations_summary_plots
+dir_out=F:\TMP
+_dir_out_run=F:\TMP\CH-FRU_FR-20240327-144235
+_dir_out_run_log=F:\TMP\CH-FRU_FR-20240327-144235\0_log
+_dir_out_run_rawdata_ascii_files=F:\TMP\CH-FRU_FR-20240327-144235\1-0_rawdata_files_ascii
+_dir_used_rawdata_ascii_files_eddypro_data_path=F:\TMP\CH-FRU_FR-20240327-144235\1-0_rawdata_files_ascii
+_dir_out_run_plots_availability_rawdata=F:\TMP\CH-FRU_FR-20240327-144235\1-1_rawdata_plots_availability
+_dir_out_run_plots_aggregates_rawdata=F:\TMP\CH-FRU_FR-20240327-144235\1-2_rawdata_plots_aggregates
+_dir_out_run_eddypro=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations
+_dir_out_run_eddypro_ini=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\ini
+_dir_out_run_eddypro_bin=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\bin
+_dir_out_run_eddypro_results=F:\TMP\CH-FRU_FR-20240327-144235\2-0_eddypro_flux_calculations\results
+_dir_out_run_plots_summary=F:\TMP\CH-FRU_FR-20240327-144235\2-1_eddypro_flux_calculations_summary_plots
 
 ## Plots
 plot_availability_rawdata=1
 plot_aggregates_rawdata=0
 plot_summary=1
 
 ## After Processing
-delete_uncompressed_ascii_after_processing=0
+delete_uncompressed_ascii_after_processing=1
 
 
 # _SCRIPT

diff --git a/fluxrun/settings/FluxRun.settingsOld b/fluxrun/settings/FluxRun.settingsOld
@@ -1,4 +1,4 @@
-_run_id=FR-20240227-120405
+_run_id=FR-20240227-140551
 
 
 # INSTRUMENTS
@@ -26,32 +26,32 @@ _sitefiles_parse_str=CH-FRU_ec_%Y%m%d-%H%M_withAGC.dat
 
 ## EddyPro
 path_selected_eddypro_processing_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.eddypro
-_path_used_eddypro_processing_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\ini\processing.eddypro
+_path_used_eddypro_processing_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\ini\processing.eddypro
 _path_found_eddypro_metadata_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.eddypro
-_path_used_eddypro_metadata_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\ini\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.metadata
-_path_used_eddypro_app_rp=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\bin\eddypro_rp.exe
-_path_used_eddypro_app_fcc=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\bin\eddypro_fcc.exe
+_path_used_eddypro_metadata_file=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\ini\CH-FRU_2023_rECord_[IRGA75]_R350-R1+IRGA75-R1.metadata
+_path_used_eddypro_app_rp=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\bin\eddypro_rp.exe
+_path_used_eddypro_app_fcc=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\bin\eddypro_fcc.exe
 
 # OUTPUT
 # ======
 
 ## Output Folder
 dir_out=F:\01-NEW\CH-FRU-FF202401\2023_rECord
-_dir_out_run=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405
-_dir_out_run_log=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\0_log
-_dir_out_run_rawdata_ascii_files=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\1-0_rawdata_files_ascii
+_dir_out_run=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551
+_dir_out_run_log=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\0_log
+_dir_out_run_rawdata_ascii_files=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\1-0_rawdata_files_ascii
 _dir_used_rawdata_ascii_files_eddypro_data_path=F:/01-NEW/CH-FRU-FF202401/2023_rECord/raw_data_ascii_rECord_filesWithAGC/raw_data_ascii_rECord_filesWithAGC
-_dir_out_run_plots_availability_rawdata=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\1-1_rawdata_plots_availability
-_dir_out_run_plots_aggregates_rawdata=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\1-2_rawdata_plots_aggregates
-_dir_out_run_eddypro=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations
-_dir_out_run_eddypro_ini=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\ini
-_dir_out_run_eddypro_bin=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\bin
-_dir_out_run_eddypro_results=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-0_eddypro_flux_calculations\results
-_dir_out_run_plots_summary=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-120405\2-1_eddypro_flux_calculations_summary_plots
+_dir_out_run_plots_availability_rawdata=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\1-1_rawdata_plots_availability
+_dir_out_run_plots_aggregates_rawdata=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\1-2_rawdata_plots_aggregates
+_dir_out_run_eddypro=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations
+_dir_out_run_eddypro_ini=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\ini
+_dir_out_run_eddypro_bin=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\bin
+_dir_out_run_eddypro_results=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-0_eddypro_flux_calculations\results
+_dir_out_run_plots_summary=F:\01-NEW\CH-FRU-FF202401\2023_rECord\CH-FRU_FR-20240227-140551\2-1_eddypro_flux_calculations_summary_plots
 
 ## Plots
 plot_availability_rawdata=1
-plot_aggregates_rawdata=1
+plot_aggregates_rawdata=0
 plot_summary=1
 
 ## After Processing

diff --git a/fluxrun/settings/_version.py b/fluxrun/settings/_version.py
@@ -1,5 +1,5 @@
 __version__ = "1.4.1"
-__date__ = "XX Mar 2024"
+__date__ = "27 Mar 2024"
 __link_source_code__ = "https://github.com/holukas/fluxrun"
 __link_releases__ = "https://github.com/holukas/fluxrun/releases"
 __link_changelog__ = "https://github.com/holukas/fluxrun/blob/master/CHANGELOG.md"

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "fluxrun"
-version = "v1.4.0"
-description = ""
+version = "v1.4.1"
+description = "Python wrapper for EddyPro flux calculations"
 authors = ["holukas <lukas.hoertnagl@usys.ethz.ch>"]
 
 [tool.poetry.dependencies]