Skip to content

Use fixed version of aot_GACP.nc #444

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.

Sign up for GitHub

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

Merged
stelliom merged 4 commits into from
Mar 7, 2026
Merged

Use fixed version of aot_GACP.nc #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b623527
Use fixed version of aot_GACP.nc
stelliom Mar 6, 2026
6a71fcf
Merge branch 'master' into update-aot-rawdata
stelliom Mar 6, 2026
166d6a1
Fixed small bug
stelliom Mar 6, 2026
851eea6
Updated get_data.sh with new references
stelliom Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user_manual/user_manual_04_python_modules.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ AeroCom | 1 x 1 degree

- generate namelist: INPUT_AOT

- data input: aot_GACP.nc( iaot_type=1),
- data input: aot_GACP_sea_salt_fixed.nc (iaot_type=1),
aod_AeroCom1.nc (iaot_type=2)

- Output: buffer file with ISA data (input_aot: aot_buffer_file)
Expand Down
2 changes: 1 addition & 1 deletion python/WrapExtpar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ def setup_aot_namelist(args):
namelist['raw_data_aot_path'] = args['raw_data_path']
namelist['aot_buffer_file'] = 'aot_buffer.nc'
if args['iaot_type'] == 1:
namelist['raw_data_aot_filename'] = 'aot_GACP.nc'
namelist['raw_data_aot_filename'] = 'aot_GACP_sea_salt_fixed.nc'
elif args['iaot_type'] == 2:
namelist['raw_data_aot_filename'] = 'aod_AeroCom1.nc'
else:
Expand Down
2 changes: 1 addition & 1 deletion run_scripts/extpar_mch.aster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ raw_data_alnid='alnid_new.nc'
raw_data_aluvd='aluvd_new.nc'
buffer_alb='month_alb_buffer.nc'

raw_data_aot='aot_GACP.nc'
raw_data_aot='aot_GACP_sea_salt_fixed.nc'
buffer_aot='extpar_buffer_aot.nc'

raw_data_tclim_coarse='CRU_T2M_SURF_clim.nc'
Expand Down
2 changes: 1 addition & 1 deletion run_scripts/extpar_mch.globe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ raw_data_alnid='alnid_new.nc'
raw_data_aluvd='aluvd_new.nc'
buffer_alb='month_alb_buffer.nc'

raw_data_aot='aot_GACP.nc'
raw_data_aot='aot_GACP_sea_salt_fixed.nc'
buffer_aot='extpar_buffer_aot.nc'

raw_data_tclim_coarse='CRU_T2M_SURF_clim.nc'
Expand Down
2 changes: 1 addition & 1 deletion test/pytest/test_wrap_extpar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def test_setup_aot_namelist_type_1():
'iaot_type': 1,
'raw_data_aot_path': '/path/to/data',
'aot_buffer_file': 'aot_buffer.nc',
'raw_data_aot_filename': 'aot_GACP.nc'
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc'
}
assert setup_aot_namelist(args) == expected_namelist

Expand Down
2 changes: 1 addition & 1 deletion test/testsuite/data/clm/ecoclimap_sg/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
2 changes: 1 addition & 1 deletion test/testsuite/data/dwd/icon_d2/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
2 changes: 1 addition & 1 deletion test/testsuite/data/dwd/icon_ecci/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
input_art = {
Expand Down
2 changes: 1 addition & 1 deletion test/testsuite/data/ecmwf/corine_icon/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
16 changes: 8 additions & 8 deletions test/testsuite/data/get_data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,38 @@ fi
# mch
test -d mch || exit 1
cd mch/c7_globe
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_mch_c7_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_mch_c7_PR444.nc'
cd -

test -d mch || exit 1
cd mch/c1_aster
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_mch_c1_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_mch_c1_PR444.nc'
cd -

# clm
test -d clm || exit 1
cd clm/12km_globe
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_12km_globe_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_12km_globe_PR444.nc'
cd -

cd clm/ecoclimap_sg
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/icon_grid_bolivia.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_eco_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_eco_PR444.nc'
cd -

# dwd
test -d dwd || exit 1

cd dwd/icon_d2
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/icon_grid_DOM01.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_d2_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_d2_PR444.nc'
cd -

cd dwd/icon_ecci
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/icon_grid_bolivia.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/clim_t2m_icon_ecci.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/clim_tsea_icon_ecci.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_ecci_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_ecci_PR444.nc'
cd -

# mpim
Expand All @@ -54,14 +54,14 @@ cd mpim/icon_r2b4
wget --quiet 'http://icon-downloads.mpimet.mpg.de/grids/public/mpim/0013/icon_grid_0013_R02B04_G.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/clim_t2m_icon_r2b4.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/clim_tsea_icon_r2b4.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_mpim_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/external_parameter_icon_mpim_PR444.nc'
cd -

# ecmwf
test -d ecmwf || exit 1
cd ecmwf/corine_icon
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/corine/icon_grid_0099_R19B10.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/corine/external_parameter_icon_corine_PR443.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/corine/external_parameter_icon_corine_PR444.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/corine/clim_tsea_corine.nc'
wget --quiet 'ftp://iacftp.ethz.ch/pub_read/stelliom/corine/clim_t2m_corine.nc'
cd -
Expand Down
2 changes: 1 addition & 1 deletion test/testsuite/data/mch/c1_aster/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
2 changes: 1 addition & 1 deletion test/testsuite/data/mch/c7_globe/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
2 changes: 1 addition & 1 deletion test/testsuite/data/mpim/icon_r2b4/namelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
input_aot = {
'iaot_type': 1,
'raw_data_aot_path': '',
'raw_data_aot_filename': 'aot_GACP.nc',
'raw_data_aot_filename': 'aot_GACP_sea_salt_fixed.nc',
'aot_buffer_file': 'aot_buffer.nc'
}
2 changes: 1 addition & 1 deletion test/testsuite/src/tools/ts_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ def set_parallelization(nprocs, nprocio):
nxy = int(nprocs) - int(nprocio)
if nxy < 1:
raise ValueError('*** ERROR: The number of total processor'\
' is smaller equal the number of I\O processors')
' is smaller equal the number of I/O processors')
parlist = []

for i in range(nxy, 0, -1):
Expand Down
Loading