Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
5ed0634
wip optional co2 coupling for awiesm3
JanStreffing Jul 9, 2025
2260545
Merge branch 'feat/awiesm3-v3.4' into feat/awiesm3-v3.4-co2
JanStreffing Jul 21, 2025
d9d50a3
get to where the coupling requires fesom2 src changes
JanStreffing Jul 21, 2025
dfcf65c
save wip towards co2 coupling
JanStreffing Jul 21, 2025
d14ffc8
Merge branch 'feat/awiesm3-v3.4' into feat/awiesm3-v3.4-co2
JanStreffing Jul 22, 2025
dcc6dce
changes to get recom coupling quite far. not there yet
JanStreffing Jul 23, 2025
76ca438
updates to co2 oasis restart file logic + appending veg emiss namelis…
JanStreffing Jul 28, 2025
8d8e888
do append namelist changes for multiple switches
JanStreffing Jul 30, 2025
82e3546
tread co2_v2a.nc and co2_a2v.nc as input files for run 1
JanStreffing Jul 30, 2025
0d0a01e
add oifs/48r1/awicm3/v3.4/namcompo_emis_co2_veg.nml
JanStreffing Jul 30, 2025
c1cbc73
add build type switch for fesom in awiesm3
JanStreffing Jul 30, 2025
aa83706
ensure awicm3 still runs
JanStreffing Aug 1, 2025
9c5df0b
update co2 output for oifs
JanStreffing Aug 1, 2025
512248a
awiesm3 cc with veg co2 again. YGHG_NL(1)%LASSIM: TRUE is back, fesom…
JanStreffing Aug 1, 2025
5d1e9e5
during testing only monthly 3d output
JanStreffing Aug 5, 2025
239a2eb
fix xios 1m to 1mo
JanStreffing Aug 5, 2025
18d965a
fix where restart files for oasis for lpjg and co2 are taken from.
JanStreffing Aug 6, 2025
fd03050
split off namcompo_emis_co2_terminator
JanStreffing Aug 6, 2025
73224d0
split off namcompo_emis_co2_terminator
JanStreffing Aug 6, 2025
2f0dde6
correct xios co2 field names
JanStreffing Aug 6, 2025
81bae74
add prototype for lpjg-OPENIFSSPINUP
JanStreffing Aug 14, 2025
7fc82d7
add darft of cmip6 unit output config for oifs 48r1
JanStreffing Aug 14, 2025
b890cef
put oifs forcing file into lpjg spinup run folders
JanStreffing Aug 15, 2025
e98605f
ensure that esm_tools is moving lpjg restarts around, as necessary st…
JanStreffing Aug 15, 2025
840bafd
save wip for using yaml and dyn allocations in lpjg
JanStreffing Aug 18, 2025
dd1e69d
ensure we send the right thing for fire co2 flux
JanStreffing Aug 18, 2025
ce454a2
Merge remote-tracking branch 'origin/release' into feat/awiesm3-v3.4-co2
JanStreffing Aug 18, 2025
8885a95
Changed number of nodes for DARS/DARS2 mesh.
nwieters Aug 21, 2025
e10638d
Merge branch 'feat/awiesm3-v3.4' into feat/awiesm3-v3.4-co2
JanStreffing Aug 25, 2025
6154be2
wip
JanStreffing Aug 25, 2025
5533efc
use parallel filemovements for JS setups
JanStreffing Aug 26, 2025
1516500
turn of mass fixers for h2o tracers if oifs48r1 by default
JanStreffing Sep 1, 2025
6f0d53e
awicm3 fesom build type release
JanStreffing Sep 9, 2025
33645d9
wip lpjg standalone openifsspinup
JanStreffing Sep 9, 2025
95143a1
changes to get awicm3-develop to compile on albedo
JanStreffing Sep 18, 2025
858791e
correct par file movement flag setting
JanStreffing Sep 18, 2025
89aebad
add co2 false to oifsamip setup
JanStreffing Sep 30, 2025
f651d3d
Added DARS2 mesh.
nwieters Oct 6, 2025
6d7140c
set metric_factor_zero for awicm3 and awiesm3
JanStreffing Oct 7, 2025
58b0b8e
LAI output for OIFS and changed instruction file
Oct 8, 2025
fc2ced5
Merge branch 'feat/awiesm3-v3.4-co2' of https://github.com/esm-tools/…
Oct 8, 2025
30cdc00
new namelist setting from Etienne. See: https://git.smhi.se/ec-earth/…
JanStreffing Oct 8, 2025
f9d6025
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Oct 8, 2025
1fa1013
Set the oifs repo and branch (feat/awiesm3-v3.4_macv2_dars2).
nwieters Oct 8, 2025
b11a19d
Added TCO319-land to grids array for AWI-ESM.
nwieters Oct 8, 2025
861644c
Small changes in lpj-guess.
nwieters Oct 8, 2025
9534d33
and high freq runoff output to oifs
JanStreffing Oct 13, 2025
01e9535
changes needed for tco319l137-dars2 awiesm3
JanStreffing Oct 16, 2025
1d9e1aa
switch fesom2 build type for awiesm3 to release
JanStreffing Oct 16, 2025
c8dff55
Merge branch 'feat/awiesm3-v3.4-co2' into feat/awiesm3-v3.4-co2-dars2
JanStreffing Oct 16, 2025
4f16ac0
ensure lpjg is controlled through lpjg_steps.yaml
JanStreffing Oct 20, 2025
01e84c4
add wishlist comp/mpi on levante
JanStreffing Oct 23, 2025
b4c5026
running AWI-ESM3-CC with intel and openmpi and omp on levante
JanStreffing Oct 27, 2025
69c4660
Merge branch 'feat/awiesm3-v3.4_macv2_dars2' into feat/awiesm3-v3.4-c…
nwieters Nov 5, 2025
4ad37d4
Merge branch 'feat/awiesm3-v3.4-co2' into feat/awiesm3-v3.4-co2-dars2
nwieters Nov 5, 2025
b9a21df
resolve merge conflict
Nov 5, 2025
9cf72ba
Small bug in lpj_guess config for maxgrid.
nwieters Nov 7, 2025
c8a0be4
update existing runscripts for awicm3 and awiesm3
JanStreffing Nov 10, 2025
a9d4a09
optimize oifs48r1 intel flags on levante
JanStreffing Nov 10, 2025
c279671
oifs changes for lpjg veg coupling were merged. pointing to vendor br…
JanStreffing Nov 10, 2025
c5e6cf4
add export paths for netcdf on levante
JanStreffing Nov 10, 2025
474f7e4
Added CMIP7 variables/values. And fix some repo and branch names.
nwieters Nov 11, 2025
11df135
add available oifs build types
JanStreffing Nov 12, 2025
82b4133
add first co2 coupling runscript
JanStreffing Nov 12, 2025
c48f2e2
take and save co2_o2a.nc from the dist subfolder
JanStreffing Nov 14, 2025
f62182e
Set pool_dir to /work/pd1284/AWIESM/
nwieters Nov 14, 2025
0bcf726
update default recom forcing folder
JanStreffing Nov 14, 2025
19e5c36
Added xios config files for cmip7 output. Those files need to be adap…
nwieters Nov 14, 2025
0baa48c
add core3 mesh
JanStreffing Nov 17, 2025
2a654e5
Merge branch 'release' into feat/awiesm3-v3.4-co2
JanStreffing Nov 17, 2025
83de836
working 2.7.0 on levante
JanStreffing Nov 17, 2025
7d91dd5
wip oifs 48r1 on albedo
JanStreffing Nov 17, 2025
e89ec9d
Merge branch 'feat/fesom2.7.0' into feat/awiesm3-v3.4-co2
JanStreffing Nov 17, 2025
e52dbb4
ensure we use the correct rnfmap version for awiesm
JanStreffing Nov 18, 2025
0d1ed27
Merge branch 'feat/awiesm3-v3.4-co2' into feat/awiesm3-v3.4-co2-dars2
nwieters Nov 19, 2025
f06ec0d
load perl
JanStreffing Nov 19, 2025
095b436
load perl in xios env yaml
JanStreffing Nov 20, 2025
f99d479
default values for CORE3 in 2.7 yaml
JanStreffing Nov 20, 2025
c416fd4
relying more on default nameslist for fesom in awicm3 develop for now
JanStreffing Nov 20, 2025
68ae533
fix lpjg restarts being split into revc und normal restart files
JanStreffing Nov 20, 2025
8d6a9c8
use this branch until PR https://git.smhi.se/ec-earth/vendor/oasis/oa…
JanStreffing Nov 20, 2025
08b8e86
remove fesom 2.6 tuning, as we start from 2.7
JanStreffing Nov 20, 2025
1b4bad7
Merge branch 'feat/awiesm3-v3.4-co2' into feat/awiesm3-v3.4-co2-dars2
nwieters Nov 21, 2025
daa1641
update awicm3 and awiesm3 develop from 2.6 to 2.7
JanStreffing Nov 21, 2025
801799c
changes to compile awicm3-develop on aleph
Nov 27, 2025
3b7722f
Change oifs branch to main (vendor)
nwieters Dec 1, 2025
27eaedb
Added DARS2 for Fesom 2.7
nwieters Dec 1, 2025
8d4e595
Merge branch 'feat/awiesm3-v3.4-co2' into feat/awiesm3-v3.4-co2-dars2
nwieters Dec 2, 2025
0591d40
add X_CO2 to 2.7
JanStreffing Dec 3, 2025
670e553
remove 2.6 versions from 2.7 yaml
JanStreffing Dec 3, 2025
7755a90
change destination for 2.7
JanStreffing Dec 3, 2025
075f39f
change fesom branch for cc version and version for awiesm3 in general
JanStreffing Dec 3, 2025
895daba
change fesom2 2.7 namelist folder name
JanStreffing Dec 3, 2025
91b414f
remove gridlist, since we can autogenerate it
JanStreffing Dec 3, 2025
0e89aa0
Corrected maxgrid.
nwieters Dec 9, 2025
de223ba
N deposition fixed configuration
Dec 11, 2025
e143a4b
update runscript
JanStreffing Dec 16, 2025
a6644cb
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Dec 16, 2025
5a5b06c
remove maxgrid and nx_atmo
JanStreffing Dec 16, 2025
4c71186
Add CMIP6/CMIP7 CO2 forcing switch for LPJ-GUESS
JanStreffing Dec 16, 2025
86263db
Add LPJ-GUESS CMIP configuration file
JanStreffing Dec 16, 2025
4abc0cf
Fix lpj_guess.yaml: move further_reading inside lpj_guess block
JanStreffing Dec 18, 2025
bbb1ceb
Add configurable spinup, LUH3 land use, and piControl support for LPJ…
Dec 19, 2025
cfed013
LPJ_GUESS: Move use_luh3_input to choose_mip for automatic CMIP-based…
Dec 19, 2025
988d848
Fix LUH3 NetCDF land use support for AWI-ESM3/LPJ-GUESS and add Corre…
Dec 19, 2025
9672e8d
Add ocean grid-specific slt file support for LPJ-GUESS
JanStreffing Dec 22, 2025
d5003b1
add X_CO2 to 2.7
JanStreffing Dec 3, 2025
f504d5c
change destination for 2.7
JanStreffing Dec 3, 2025
54d2465
change fesom branch for cc version and version for awiesm3 in general
JanStreffing Dec 3, 2025
c1e0a23
change fesom2 2.7 namelist folder name
JanStreffing Dec 3, 2025
8ac9369
remove gridlist, since we can autogenerate it
JanStreffing Dec 3, 2025
9117519
update runscript
JanStreffing Dec 16, 2025
50b0eab
N deposition fixed configuration
Dec 11, 2025
bd0e617
remove maxgrid and nx_atmo
JanStreffing Dec 16, 2025
8811af0
Add CMIP6/CMIP7 CO2 forcing switch for LPJ-GUESS
JanStreffing Dec 16, 2025
3e63b3f
Add LPJ-GUESS CMIP configuration file
JanStreffing Dec 16, 2025
6c97042
Fix lpj_guess.yaml: move further_reading inside lpj_guess block
JanStreffing Dec 18, 2025
9ec197b
Add configurable spinup, LUH3 land use, and piControl support for LPJ…
Dec 19, 2025
540c498
LPJ_GUESS: Move use_luh3_input to choose_mip for automatic CMIP-based…
Dec 19, 2025
94ced37
Fix LUH3 NetCDF land use support for AWI-ESM3/LPJ-GUESS and add Corre…
Dec 19, 2025
864a4ef
Add ocean grid-specific slt file support for LPJ-GUESS
JanStreffing Dec 22, 2025
5430781
Set lpjg input path to pooldir.
nwieters Dec 30, 2025
e7fb13b
fixes https://github.com/esm-tools/esm_tools/issues/1260
JanStreffing Jan 7, 2026
0767e28
revert
JanStreffing Jan 7, 2026
dff4938
update paths_forcing.j2 for luh3
JanStreffing Jan 7, 2026
ac36897
Merge branch 'feat/awiesm3-v3.4-co2' into feat/awiesm3-v3.4-co2-dars2
JanStreffing Jan 7, 2026
27a66a4
fixed land use year option
JanStreffing Jan 7, 2026
035732b
test moving lpj_guess output to outdata dir
JanStreffing Jan 7, 2026
40091c9
working output moving for lpjg
JanStreffing Jan 8, 2026
32539bf
update runscripts
JanStreffing Jan 8, 2026
3ab6197
use yearly luh3 transition files. dont set ocean grid name in lpjg st…
JanStreffing Jan 12, 2026
c0f3d5d
update core2 test
JanStreffing Jan 12, 2026
1f95169
no more mygrid default. its just the resolution now
JanStreffing Jan 15, 2026
9801690
some updates for lpjg spinup setup
JanStreffing Jan 15, 2026
f290665
first running lpjg_standalone spinup
JanStreffing Jan 15, 2026
2cbc1f7
standalone runs and nyear_spinup can be controlled from esm_tools
JanStreffing Jan 16, 2026
ded8aa7
Fix LUH3 template format and cmip version compatibility; add peat fil…
Jan 16, 2026
4d01a6f
no reading ndep files for spinup. makes the spinup take 10x longer
JanStreffing Jan 16, 2026
9225d4a
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Jan 16, 2026
e22327d
fix Sweeney_2005.nc path name for fesom 2.7 on levante
JanStreffing Jan 19, 2026
c99c7f1
control freenyears (number of years without nitrogen limitation for s…
JanStreffing Jan 19, 2026
074f499
correctly set freegreenyears for spinup
JanStreffing Jan 21, 2026
6d51ea2
update lpjg spinup runscript
JanStreffing Jan 21, 2026
c0c132e
luh3 cleanup, part1
JanStreffing Jan 21, 2026
86d351f
co2 coupling option makes no sense for spinup
JanStreffing Jan 21, 2026
c61ebbf
luh3 cleanup, part2
JanStreffing Jan 21, 2026
ddf5f9f
rename namcouple fields for co2 coupling
JanStreffing Jan 21, 2026
80f3730
keep only needed outputs for generating lpjg spinup file
JanStreffing Jan 22, 2026
f890cc6
new field def for writing lpjg standalone forcing files from oifs
JanStreffing Jan 22, 2026
f7c0f4e
Add SIMFIRE/BLAZE fire module support and LUH3 file handling
Jan 23, 2026
e77eb92
remove double lpjg. turn blaze fire on for cmip7
JanStreffing Jan 26, 2026
1d98c51
critical bug fix. surf_relax_s needs to be set to zero in namelist.tr…
JanStreffing Jan 30, 2026
aed8bcc
Add initial_year for continuous spinup output
Feb 2, 2026
5c8cf40
set linfs and meltponds for awicm3 and awiesm3 v3.4+
JanStreffing Feb 4, 2026
1ddc10d
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Feb 4, 2026
3823435
adding fesom2 namelist presets for CMIP7
JanStreffing Feb 4, 2026
b9aa682
add tbb for oifs48r1 on albedo
JanStreffing Feb 4, 2026
9efc0f7
update albedo pool dir for awiesm3
JanStreffing Feb 5, 2026
8778b10
update tbb link path
JanStreffing Feb 5, 2026
c22e7e7
put luh3_input_dir into cmip7 yaml
JanStreffing Feb 5, 2026
16551da
test for removing luh3_yearly_transitions at some point
JanStreffing Feb 6, 2026
1a11594
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Feb 6, 2026
2a5fdc2
nyearifs added to guess.ins.j2
JanStreffing Feb 7, 2026
bcc62d8
adding HR lpjg spinup script
JanStreffing Feb 7, 2026
b97e294
update for lpjg HR spinup
JanStreffing Feb 9, 2026
4e0a5e0
update lpjg spinup runscripts
JanStreffing Feb 9, 2026
1b0f151
add spin HR
JanStreffing Feb 9, 2026
6066e4a
remove old runscripts
JanStreffing Feb 9, 2026
3e57068
Merge remote-tracking branch 'origin/release' into feat/awiesm3-v3.4-…
JanStreffing Feb 9, 2026
0c2dfe7
make omp work on albedo
JanStreffing Feb 9, 2026
4d0a937
use albedo pool for lpjg standalone
JanStreffing Feb 9, 2026
f045fab
remove runscripts from historic hpc
JanStreffing Feb 9, 2026
dbaf779
set full cmip7 forcings for oifs for spinup
JanStreffing Feb 11, 2026
48f1564
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Feb 11, 2026
e2a58cb
don't need this var
JanStreffing Feb 11, 2026
2515655
Merge branch 'feat/awiesm3-v3.4-co2_merge-main' into feat/awiesm3-v3.…
JanStreffing Feb 11, 2026
0130556
lpjg is merged, branch and version not needed anymore
JanStreffing Feb 11, 2026
dbfb9dc
lpjg cmip7 forcings ready
JanStreffing Feb 11, 2026
8c0b010
don't tar binary fesom restart files for awicm/esm3, to save time
JanStreffing Feb 11, 2026
847075e
add tuning yaml for oifs and cmip7_data_dir
JanStreffing Feb 11, 2026
4499aaf
add tuning yaml for oifs and cmip7_data_dir
JanStreffing Feb 11, 2026
9b776f4
Change AMIP repository.
nwieters Jan 23, 2026
d985354
Bugfix for AMIP coupling time step.
nwieters Feb 9, 2026
01544b9
add optional parallel copy and merge for lpjg txt output files. defau…
JanStreffing Feb 12, 2026
c52da3b
add optional parallel copy and merge for lpjg txt output files. defau…
JanStreffing Feb 12, 2026
a3069ce
update albedo core3 runscript for AWIESM3 on albedo
JanStreffing Feb 12, 2026
5d1c8da
rm branchoff script
JanStreffing Feb 12, 2026
c5eba73
Add XIOS xml files for OIFS CMIP7 spinup output.
nwieters Feb 12, 2026
61f466b
make lpjg_default_cmip7_output.ins.j2 where daily output can be turne…
JanStreffing Feb 12, 2026
a9be863
Get CMIP7 spinup output files (starting atmos.) into output folder.
nwieters Feb 12, 2026
0e8bf08
Fix formatting for timeseries and output_freq attributes
JanStreffing Feb 12, 2026
ede7edb
Merge pull request #1437 from esm-tools/feat/awiesm3-v3.4-co2_xioscmi…
JanStreffing Feb 12, 2026
e3fd915
Adding additional monthly surface variables to OIFS CMIP7 spinup output.
nwieters Feb 13, 2026
84313a7
bug fix, do not hardcode l137 for o3 layers
JanStreffing Feb 13, 2026
201dbc1
Add choose_mip for oifs xios output config.
nwieters Feb 13, 2026
39fdc83
Add new switch for cmip7 output type; make output remapping resolutio…
nwieters Feb 13, 2026
4fd7970
Merge pull request #1440 from esm-tools/feat/awiesm3-v3.4-co2_xioscmi…
nwieters Feb 13, 2026
b82f17a
Corrected oifs remapping output resolution.
nwieters Feb 13, 2026
89f74ed
Merge pull request #1442 from esm-tools/feat/awiesm3-v3.4-co2_xioscmi…
nwieters Feb 13, 2026
a3dfa29
adding awiesm3 v3.4.0
JanStreffing Feb 13, 2026
b1832d3
fix v3.4.0 for lpjg spinup
JanStreffing Feb 13, 2026
1cde4f4
adding runscripts for awicm3-v3.4.0
JanStreffing Feb 13, 2026
965562d
Merge branch 'feat/awiesm3-v3.4-co2' of github.com:esm-tools/esm_tool…
JanStreffing Feb 13, 2026
1a3f6ec
update runscripts
JanStreffing Feb 14, 2026
9ee264c
final updates
JanStreffing Feb 16, 2026
9a90834
add with_cavity choose block
JanStreffing Feb 16, 2026
982b7e3
add default value for with_cavity switch
JanStreffing Feb 17, 2026
d24eae6
updates for v3.4.1
JanStreffing Feb 17, 2026
623eb60
Add oifs macv2sp 550nm aod output.
nwieters Feb 17, 2026
89aa741
Add OIFS version 48r1v2.
nwieters Feb 17, 2026
e174c57
Add runscripts for awiesm3-v3.4.1.
nwieters Feb 17, 2026
ded25d6
Merge branch 'release' of github.com:esm-tools/esm_tools into feat/aw…
JanStreffing Feb 18, 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
4 changes: 2 additions & 2 deletions configs/components/amip/amip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ amip:
##
clean_command: rm -rf bin; cd src; make clean; cd ..
comp_command: rm -rf bin; mkdir bin; cd src; make ; cd .. ; cp bin/amip-forcing.exe ./bin/amip
git-repository: https://gitlab.dkrz.de/ec-earth/amip-forcing.git
git-repository: https://gitlab.dkrz.de/ec-earth/amip-forcing-ece4.git
install_bins: bin/amip
##
## Directories
Expand Down Expand Up @@ -79,7 +79,7 @@ amip:
namelist.amip:
NAMAMIP:
RunLengthSec: "${runtime_seconds}"
TimeStepSec: "84600"
TimeStepSec: "86400"
FixYear: "0"
StartYear: "1850"
FileListSST: ${input_in_work.sst_forcing}
Expand Down
16 changes: 16 additions & 0 deletions configs/components/fesom/fesom-2.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ fesom:
whichEVP: 0
alpha_evp: 250 # constant that control numerical stability of mEVP.
beta_evp: 250 # constant that control numerical stability of mEVP.
CORE3:
nx: 211567
mesh_dir: "${fesom.mesh_base_dir}/core3/"
nproc: 128
whichEVP: 1
alpha_evp: 300 # constant that control numerical stability of mEVP.
beta_evp: 300 # constant that control numerical stability of mEVP.
pi:
nx: 3140
mesh_dir: "${fesom.mesh_base_dir}/pi/"
Expand Down Expand Up @@ -179,6 +186,11 @@ fesom:
whichEVP: 1
alpha_evp: 500 # constant that control numerical stability of mEVP.
beta_evp: 500 # constant that control numerical stability of mEVP.
DARS2:
nx: 3146761
whichEVP: 1
alpha_evp: 500 # constant that control numerical stability of mEVP.
beta_evp: 500 # constant that control numerical stability of mEVP.
ROS2:
nx: 26306560
whichEVP: 1
Expand Down Expand Up @@ -624,6 +636,8 @@ fesom:
grid: feom
v_feom:
grid: feom
FCO2_feom:
grid: feom
taux_oce:
grid: feom
tauy_oce:
Expand Down Expand Up @@ -656,6 +670,8 @@ fesom:
grid: feom
v10w_oce:
grid: feom
XCO2_oce:
grid: feom


wiso_fields:
Expand Down
Loading
Loading