From 68f579d469d26271a9e2f130dac655b8bc546c4e Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Fri, 23 May 2025 11:05:22 +0200 Subject: [PATCH] Removed countries changed from list to dictionary --- src/in-situ/camsFormatter.py | 18 +++++++++++------- ...riterdaf90.cpython-37m-x86_64-linux-gnu.so | Bin 149336 -> 149336 bytes src/in-situ/run_nord3.sh | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/in-situ/camsFormatter.py b/src/in-situ/camsFormatter.py index afd437b..3382a31 100755 --- a/src/in-situ/camsFormatter.py +++ b/src/in-situ/camsFormatter.py @@ -143,13 +143,6 @@ def read_and_process_data(iDate, fDate, dataDir, elements, an_re, unit, remove_c # Create a countries column to cut later df["COUNTRY"] = [station[:2] for station in df["STATION"]] - # Remove countries if they are in remove countries list - print("REMOVING COUNTRIES: {}".format(remove_countries)) - print(len(df)) - df = df[~df["COUNTRY"].isin(remove_countries)] - print(len(df)) - # Save the index of the data removed - index_removed = df[df["COUNTRY"].isin(remove_countries)].index # Add all observational events for each specific date and element @@ -159,6 +152,17 @@ def read_and_process_data(iDate, fDate, dataDir, elements, an_re, unit, remove_c print(date) cut_df = df[(df.element_con == e) & (df.date == date)] + try: + countries_by_element = remove_countries[e] + except: + print("No countries for that element") + countries_by_element = [] + print(countries_by_element) + + print("Removing {} countries for element: {}".format(countries_by_element, e)) + cut_df = cut_df[~cut_df["COUNTRY"].isin(countries_by_element)] + + # Apply boundaries for the values cut_df = cut_df[cut_df['CONCENTRATION'].between( diff --git a/src/in-situ/elwriterdaf90.cpython-37m-x86_64-linux-gnu.so b/src/in-situ/elwriterdaf90.cpython-37m-x86_64-linux-gnu.so index d58c8adaf9aa60ff00300f296091e0b36db306d8..deb3eaa51ef79bf0d51697d2406e53229b214b12 100755 GIT binary patch delta 5661 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 delta 5661 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 aexq>y|FglYJk`Y;bJb(v1$pYOtp5e2ia@pi diff --git a/src/in-situ/run_nord3.sh b/src/in-situ/run_nord3.sh index c6f6e48..fb1e41d 100755 --- a/src/in-situ/run_nord3.sh +++ b/src/in-situ/run_nord3.sh @@ -57,7 +57,7 @@ southbound='-27.0' uncb='{"O3":0.01,"CO":0.01,"NO2":0.005,"SO2":0.005,"PM10":0.0001,"PM25":0.0005}' uncc='{"O3":0.001,"CO":0.001,"NO2":0.005,"SO2":0.0005,"PM10":0.00001,"PM25":0.00005}' -remove_countries='["RO"]' +remove_countries='{"CO":["RO"]}' #start date -- GitLab