Skip to content
Merged
Show file tree
Hide file tree
Changes from 195 commits
Commits
Show all changes
201 commits
Select commit Hold shift + click to select a range
e7eb2ed
fix previously introduced bug: use correct archfile with AGRIF config…
seb-wahl Dec 6, 2022
7b7bb1c
added AGRIF configuration without AOW tracer
seb-wahl Dec 12, 2022
878539a
added missint nemo-ORCA05_LIM2_FOCI_AGRIF+echam-6.3.05p2-foci folder
seb-wahl Dec 12, 2022
e7a9645
fix leap year settings
seb-wahl Dec 13, 2022
d50db54
started adding things for Tco399-ORCA12. Also add ln_single_prec_send…
Dec 14, 2022
8cb5960
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
Dec 14, 2022
241de9e
oifs annual means was not working. Seems ok now.
Dec 23, 2022
95793a2
bugfixes in monitoring for nemo
seb-wahl Jan 12, 2023
28433db
added runscript for spinup-1950 for foci-openifs
Jan 18, 2023
c2cf835
fix small conflict
Jan 18, 2023
883271a
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
seb-wahl Jan 19, 2023
38b331e
added mocsigma and 26.5N AMOC MAX
seb-wahl Jan 19, 2023
4303393
clean up focioifs and fix runoff for AGRIF
Jan 25, 2023
9cdf132
FOCI-OpenIFS-VIKING10 works on glogin with proper runoff remapping
Jan 25, 2023
a39d2d0
add settings for ORION10X
Feb 10, 2023
aa6f8e3
added a few foci runscript examples
seb-wahl Feb 22, 2023
daf3af1
Merge branch 'release' into geomar_dev
seb-wahl Feb 22, 2023
622c93e
added correct nest_refinement for WG10v4
seb-wahl Feb 22, 2023
d84a490
first draft of eORCA025.z75.SI3, still crashes with diamond shape pat…
seb-wahl Feb 27, 2023
29d55b3
fixed two bugs in nemo postprocessing (date math)
seb-wahl Feb 28, 2023
dcc94a8
added nemo4.2 configuration that ran 3 years using JRA-55 forcing and…
seb-wahl Mar 2, 2023
1e35383
fixed date bugs in nemo_postprocessing.sh
seb-wahl Mar 2, 2023
3195b9a
added test queue on HLRN4 machines
seb-wahl Mar 2, 2023
2c399da
Merge pull request #908 from esm-tools/feature/add-eORCA025-standalone
seb-wahl Mar 2, 2023
6ceb634
remove set -vx
seb-wahl Mar 2, 2023
6c570a2
focioifs-3.0 compiles, won't run as now NEMO4.2 specific adjustments …
seb-wahl Mar 6, 2023
4e859e6
add _nemo4 to compile settings for glogin
seb-wahl Mar 8, 2023
4126a2e
fix a typo in blogin.yaml
seb-wahl Mar 8, 2023
3b77561
add TCO95_eORCA025 switch
seb-wahl Mar 8, 2023
743d3dc
change xml files for NEMO4, and add new OpenIFS dev branch for 3.0
Mar 10, 2023
bcad52e
Merge branch 'feature/add-focioifs-3.0' of https://github.com/esm-too…
Mar 10, 2023
a729476
add gcc 9.3.0 to main module for compiling FOCI-OpenIFS on glogin
Mar 21, 2023
c516d30
new script for generating OpenIFS initial conditions from GRIB output…
Mar 24, 2023
0b9d063
bug fix for oifs processing when running annual restarts
Mar 24, 2023
6dc699a
add LNEMOLIMCUR to run with relative winds in FOCI-OIFS
Mar 24, 2023
792440f
fixed modules for NEMO4
seb-wahl Mar 28, 2023
fa8d896
focioifs-3.0 technically up and running (piCtl)
seb-wahl Mar 28, 2023
9c77bd5
Merge pull request #928 from esm-tools/feature/add-focioifs-3.0
seb-wahl Mar 28, 2023
50eb4fb
Merge pull request #929 from esm-tools/release
seb-wahl Mar 28, 2023
4622ba3
add abrupt 4xCO2 scenario to oifs.yaml. Also add runscript to branch …
Apr 26, 2023
d3a7353
added eoptmized nodes for glogin
May 10, 2023
81b31e4
fix for branch-off experiments with eternal restarts in OpenIFS. Now …
May 11, 2023
01a89db
openifs runs on NESH, but post fails with git exec error
Jun 6, 2023
2c320e1
oifs-43r3-v2 is now based on branch foci211. Also fixed postprocessin…
Jun 14, 2023
356c617
new xml files
Jun 19, 2023
526c06e
add orbital parameters to climMEMODEL runscript
Jun 20, 2023
d3ae37b
Merge pull request #983 from esm-tools/release
seb-wahl Jun 26, 2023
daf374c
module load git git-lfs on nesh
Jun 26, 2023
7a8d234
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
Jun 26, 2023
4f959b7
set ini_pseudo_initial_date in case not already set
Aug 21, 2023
4bb0c1f
add L75 option. Also add Calving mask for AGRIF, e.g. ORION10
Aug 21, 2023
026a21c
add Intel 2022 / IMPI 2021 as compile option on glogin. The older, In…
Aug 21, 2023
3c78549
add settings for calving on AGRIF, and also Tco319-ORCA12 config. Als…
Aug 21, 2023
87adb62
runscript to run Tco319-ORCA12 on glogin. Works, but slower than Tco9…
Aug 21, 2023
05d8adb
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
Aug 21, 2023
09fdf76
update IO_LIB_ROOT for Intel 2022 compilers on glogin
Sep 1, 2023
6ae0ecf
New Intel compilers (2022 and beyond) do not accept -mkl=sequential a…
Sep 1, 2023
2142858
fix so that clean command also removed BLD and arch_nemo.fcm for NEMO.
Sep 1, 2023
98d3047
fixed so that month 08 is no longer interpreted as an octal number. S…
Sep 1, 2023
857fe6b
add OpenIFS output on theta levels to oifs_postprocessing.sh
Sep 8, 2023
a3583c2
switch domain_cfg file for NEMO4. The old one was bad
joakimkjellsson Oct 11, 2023
70d4a2c
add gcc so that XIOS compiles properly
joakimkjellsson Oct 11, 2023
53b4d21
bugfix so that nemo post script works for monthly restarts properly. …
joakimkjellsson Oct 11, 2023
f5fc139
better default nproc settings for FOCI-OpenIFS 4.0
joakimkjellsson Oct 11, 2023
aa64631
make new version: FOCI-OpenIFS 2.2 with new switches to use 1st order…
joakimkjellsson Oct 20, 2023
14f079e
first draft of fs_oasismct4
seb-wahl Oct 23, 2023
a156b9d
introduce FOCI-OpenIFS v2.2 using OASIS3-MCT master branch directly f…
joakimkjellsson Oct 24, 2023
e2b5b4e
add clean command for oasis mct5
joakimkjellsson Nov 7, 2023
4a78574
add file_def_agrif for agrif-3.0
joakimkjellsson Nov 20, 2023
4cc23f0
we can now choose conserv (1st order) or gauswgt for atm-agrif remapp…
joakimkjellsson Nov 20, 2023
dbe9e0f
new way to activate load balancing tool (LUCIA) in OASIS MCT5
joakimkjellsson Nov 20, 2023
4284429
added FOCI-OpenIFS 3.0_busan. OpenIFS 43r3 + NEMO 4.2 (ORCA05 L46)
joakimkjellsson Nov 23, 2023
c22457b
added FOCI-OpenIFS 2.2 with OASIS-MCT5. Works on glogin
joakimkjellsson Nov 23, 2023
7075ea3
add correct xml files for nemo4 (focioifs 3.0_busan)
joakimkjellsson Nov 23, 2023
12270c4
Merge pull request #1101 from esm-tools/feature/oasis_from_cerfacs
joakimkjellsson Dec 4, 2023
718ee3b
add variable oasis_p to control if we set P 2 (for NEMO 3.6) or P 0 (…
joakimkjellsson Dec 4, 2023
1daccb3
switch to OASIS MCT5 for Busan version of FOCI-OpenIFS
joakimkjellsson Dec 4, 2023
faac4f3
change MCT version also here
joakimkjellsson Dec 4, 2023
4293d10
add bilinear and bicubic remapping methods for FOCI-OpenIFS. This mea…
joakimkjellsson Dec 4, 2023
e35d3e1
output contains z on surface, not hybrid level
joakimkjellsson Dec 4, 2023
5e00fec
updated runscript for focioifs3_busan
joakimkjellsson Dec 12, 2023
5503943
change leapyear to true for ORCA05 coupled config with NEMO4. Warning…
joakimkjellsson Dec 19, 2023
20c14dd
Merge pull request #1110 from esm-tools/focioifs3_busan
seb-wahl Dec 19, 2023
e1f9d01
switch domain_cfg for NEMO4-ORCA05 to exclude Caspian Sea
joakimkjellsson Jan 29, 2024
df6193a
Switch NEMO4 version to NEMO 4.2.2 (ice drag bugfix)
joakimkjellsson Jan 30, 2024
696588d
switch to intel 2022 on glogin. seems fine and its good to be up to date
joakimkjellsson Feb 2, 2024
ad6afee
add NEMO4 output to postprocessing. diaptr2D etc
joakimkjellsson Feb 2, 2024
ba3222e
add ICMSH and ICMGG files to output files for OpenIFS
joakimkjellsson Feb 6, 2024
0eefc52
update runscripts for FOCI-OpenIFS
joakimkjellsson Feb 6, 2024
77b1185
update runscripts for FOCI-OpenIFS
joakimkjellsson Feb 6, 2024
9870c0d
Merge pull request #1131 from esm-tools/focioifs3_busan
joakimkjellsson Feb 7, 2024
c9013c7
added regular_pl_zoom output for OpenIFS, which is pressure-level out…
joakimkjellsson Feb 7, 2024
d93fb9f
added runscripts for HighResMIP runs with FOCI-OpenIFS-VIKING10
joakimkjellsson Feb 7, 2024
070cc47
added (I know it's the wrong branch)
seb-wahl Feb 13, 2024
219c7ae
removed -l from default shell interpreter, caused problems on HLRN
seb-wahl Feb 13, 2024
20782bd
Merge pull request #1132 from esm-tools/feat/foci_mct4_smag
seb-wahl Feb 13, 2024
e019702
Merge branch 'release' into geomar_dev
seb-wahl Feb 14, 2024
519bba6
revert the foci specific change in pattern as it otherwise fails
seb-wahl Feb 14, 2024
b213453
added an explanation for FOCI in case restart files are not found
seb-wahl Feb 14, 2024
bfe9d18
in case config["restart_in_sources"] are given explicitely
seb-wahl Feb 15, 2024
2463de2
in case config["restart_in_sources"] are given explicitely
seb-wahl Feb 15, 2024
2d81ab5
updated highresmip/focioifs-sp1950-agrif-glogin.yaml to be compatible…
seb-wahl Feb 15, 2024
1b001fc
focioifs 3.1 with ECWAM. Works on glogin
joakimkjellsson Feb 16, 2024
898b680
rename versions of FOCI-OpenIFS. Does not work yet
joakimkjellsson Feb 21, 2024
14a90d5
fixed runoff coupling fields (otherwise FOCI-AGRIF will not compile
seb-wahl Feb 23, 2024
9c30203
added MOPS via direct coupling
seb-wahl Feb 23, 2024
5c9806b
introduce new versions for NEMO and remove some versions. Attempt to …
joakimkjellsson Mar 4, 2024
6cd84c9
turn of -g -traceback for OpenIFS and switch from -O1 to -O3 on glogi…
joakimkjellsson Mar 4, 2024
5a594cd
remove a coupling which was badly named and not needed
joakimkjellsson Mar 4, 2024
c3297e3
add comment for sclct_switch in oifs.yaml. And set 1800s to default t…
joakimkjellsson Mar 4, 2024
5cf0d5c
rename focioifs versions and add comments. Also move lots of paramete…
joakimkjellsson Mar 4, 2024
c74bc86
rename some runscripts to fit new version names
joakimkjellsson Mar 4, 2024
0f9b1a2
add new couplings with more reasonable names. One for 3.0 (with MCT5)…
joakimkjellsson Mar 4, 2024
7c4cd8a
fix path for NEMO src code
joakimkjellsson Mar 4, 2024
8e6a169
runscript for FOCI-OpenIFS 3.0
joakimkjellsson Mar 4, 2024
59b3e99
rename more couplings. FOCI-OpenIFS v3.0 and v4.0 runs
joakimkjellsson Mar 5, 2024
59779d0
I dont think the choose statement in xios.yaml is needed. It just sea…
joakimkjellsson Mar 5, 2024
0dd0e76
renamed runscript for FOCI-OpenIFS 4
joakimkjellsson Mar 5, 2024
ccf6d5e
re-configure viscosity to properly scale from ORCA05. Note: Only need…
joakimkjellsson Mar 6, 2024
0d10f48
renamed AGRIF config from using foci22 to foci30
joakimkjellsson Mar 6, 2024
74f0b91
use new coupling for FOCI-OpenIFS AGRIF
joakimkjellsson Mar 6, 2024
0b6113a
Merge pull request #1143 from esm-tools/focioifs_correct_versions
joakimkjellsson Mar 13, 2024
b7bfd77
foci-openifs 4.0 compiles on olaf. Not sure it runs
joakimkjellsson Mar 13, 2024
bc1883e
update paths on olaf
joakimkjellsson Apr 16, 2024
0a90f79
correct location for geomar libs on olaf
joakimkjellsson Apr 17, 2024
e2ca53a
focioifs-agrif-4.0 compiles on glogin. Still need to add proper 1_nam…
joakimkjellsson Apr 18, 2024
37f328a
added coupling for focioifs-agrif-4.0
joakimkjellsson Apr 18, 2024
831748b
add input files and namelists for NEMO 4 with NWPAC10 nest
joakimkjellsson Apr 18, 2024
213e956
added OASIS_NETCDF and OASIS_NETCDFF for all machines (except old Mis…
joakimkjellsson Apr 19, 2024
d686aa0
avoid duplicated add_namelist_changes in nemo.yaml. Also introduce us…
joakimkjellsson Apr 23, 2024
9931cea
switch to agrif branch of runoff mapper for focioifs-agrif-4.0. Also …
joakimkjellsson Apr 23, 2024
c3d1726
added runscript for focioifs-agrif-4.0 on glogin
joakimkjellsson Apr 23, 2024
4b054fe
added runscript for focioifs-agrif-3.0 piControl on glogin
joakimkjellsson Apr 23, 2024
f92bf11
change from rnfmap-foci211 to rnfmap-agrif in focioifs-agrif-4.0
joakimkjellsson Apr 23, 2024
2249fc1
first draft including MOPS with AGRIF
seb-wahl Apr 24, 2024
73ae37a
AGRIF-MOPS compiles and runs until it hits an error in trcsms_my_trc.F90
seb-wahl Apr 26, 2024
baf26da
Merge pull request #1169 from esm-tools/feature/ibs_olaf
joakimkjellsson Apr 29, 2024
8282024
added gloginp3 machine for Emmy Phase 3 (NHR)
joakimkjellsson Jun 4, 2024
37a31f3
finally got FOCI-OpenIFS-AGRIF 4.0 (NWPAC10) running on glogin (old n…
joakimkjellsson Jun 30, 2024
1b16517
added partitions etc for glogin phase 3 nodes
joakimkjellsson Jun 30, 2024
9074817
we always choose the old nodes on glogin. No way to figure out the di…
joakimkjellsson Jun 30, 2024
61bbf3c
bugfix. Set Euler step differently for NEMO 3.6 and 4.2
joakimkjellsson Jul 5, 2024
85926fd
update for NESH (Kiel University). FOCI-OpenIFS compiles and runs.
joakimkjellsson Jul 5, 2024
f78d35d
fixes to run OpenIFS on nesh (Kiel uni)
joakimkjellsson Jul 18, 2024
93c1992
fixes for olaf
joakimkjellsson Jul 19, 2024
6ba85be
Merge branch 'release' into geomar_dev
pgierz Jul 19, 2024
75ef44c
preliminary changes made to get FOCI work on blogin
seb-wahl Jul 25, 2024
818e3c6
Upgrade oifs-43r3-v2 to use OASIS-MCT5 and XIOS trunk since older ver…
Jul 30, 2024
6866229
update environment changes for OpenIFS compilation on blogin with Int…
Jul 30, 2024
0518762
set new default compilers for Intel
Jul 30, 2024
2e6a1eb
fixes to compile FOCI-OpenIFS on blogin. Must change in arch files to…
Aug 5, 2024
7ae42ed
my poor attempt to run on glogin. Added OpenMPI option for NEMO
joakimkjellsson Aug 1, 2024
ca1702a
added new options for OpenIFS, XIOS and rnfmap on glogin
joakimkjellsson Aug 1, 2024
88a1a8b
remove gloginp3. We will just have glogin
joakimkjellsson Aug 1, 2024
cdf891c
focioifs now compiles with both intel+intelmpi and intel+openmpi. but…
joakimkjellsson Aug 5, 2024
f6600d3
trying to use intel+openmpi on glogin. Crashed with srun. Hangs with …
joakimkjellsson Aug 5, 2024
bf01e1e
update runscript for focioifs with intel+openmpi on glogin
joakimkjellsson Aug 5, 2024
5c7b892
new compiler_mpi=intel2021_impi2019 using spack on glogin. Still FOCI…
joakimkjellsson Aug 7, 2024
058fcf9
SUCCESS! FOCI-OpenIFS 3.0 now runs on glogin. Still unclear about FOC…
joakimkjellsson Aug 15, 2024
7480ae9
fix path to NCO and CDO on glogin
joakimkjellsson Aug 29, 2024
438d34d
modify runscripts for FOCI-OpenIFS 4.0 and 3.0-AGRIF for new glogin
joakimkjellsson Aug 29, 2024
e713dfd
Merge branch 'geomar_dev' into feature/blogin-rockylinux9
joakimkjellsson Aug 29, 2024
eca8101
Merge pull request #1210 from esm-tools/feature/blogin-rockylinux9
joakimkjellsson Aug 29, 2024
50b4295
update oifs env for new nesh, and remove mistral settings
joakimkjellsson Sep 3, 2024
beafb60
switch to new compilers, icc->icx, ifort->ifx
joakimkjellsson Sep 3, 2024
9b56521
set default nest1: false, instead of no. focioifs.yaml needs to evalu…
joakimkjellsson Sep 5, 2024
f8ad9dd
add restart file to restart Tco399+ORCA12 on glogin new nodes
joakimkjellsson Sep 5, 2024
3d70939
added for echam export vars for oasis
Sep 9, 2024
51c91f2
fix small syntax error for nesh.yaml
joakimkjellsson Sep 11, 2024
5472722
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
joakimkjellsson Sep 11, 2024
527416d
fix(esm_parser.py): no more complex numbers
pgierz Jul 22, 2024
ce1ae1b
added missing IDEAL tracer definition for FOCI_AGRIF_MOPS configuration
Sep 16, 2024
834cc90
Added missing configuration for foci_mops
Sep 16, 2024
c23c968
Adapted runscripts to a pre final version -> further test necessary
Sep 16, 2024
8fbc557
Merge remote-tracking branch 'origin/geomar_dev' into geomar
seb-wahl Oct 7, 2024
bb0c71c
Merge remote-tracking branch 'origin/feature/mops_agrif_direct_coupli…
seb-wahl Oct 8, 2024
0716a9f
make FOCI-MOPS work again after the merge of Tronjes and
seb-wahl Oct 10, 2024
afd19f6
added some comments on namelist changes for nemo in FOCI-OpenIFS 4.0
joakimkjellsson Oct 14, 2024
6d97451
Ladies and Gentlemen! Introducing: FOCI-OpenIFS 4.1 with eORCA05.L75 …
joakimkjellsson Oct 15, 2024
1b276bd
Merge branch 'release' into feature/merge_release_geomar_dev
seb-wahl Oct 16, 2024
63783d3
Merge remote-tracking branch 'origin/release' into feature/merge_rele…
seb-wahl Nov 5, 2024
3d00162
Added a yaml file to restart ESM simulations with ssp scenarios from …
Nov 6, 2024
b798691
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
seb-wahl Nov 13, 2024
a50f001
Merge branch 'geomar_dev' into geomar
seb-wahl Nov 13, 2024
5c66d73
fixed name pattern for glogin standard96 compute nodes
seb-wahl Nov 19, 2024
aca32a9
Merge branch 'geomar_dev' into geomar
seb-wahl Nov 19, 2024
f10a75f
Update oasis.py
TronjeKemena Nov 22, 2024
73161e6
Added git to the modules. This is no more a standard librabry since t…
Nov 25, 2024
f33fa89
load git-lfs by default as no system git is available anymore
seb-wahl Nov 25, 2024
0ce9f6e
fix a merge error in geomar branch
seb-wahl Nov 25, 2024
445a7b9
fixed echam monitoring, added comment to NEMO monitoring
seb-wahl Nov 26, 2024
6655469
added perl modules for XIOS, NEMO and OIFS compilation, replaces cust…
seb-wahl Nov 27, 2024
6601375
added draft for FOCIOIFS-4.0 runscript on levante for Rene
seb-wahl Nov 28, 2024
e7df635
fixed coupling for OASISMCT4 with foci-default
seb-wahl Dec 3, 2024
4954e83
Merge branch 'release' into geomar_dev
seb-wahl Jan 23, 2025
43b6269
Update configs/components/oifs/oifs.env.yaml
mandresm Feb 14, 2025
eb04edb
Update configs/components/oifs/oifs.yaml
mandresm Feb 14, 2025
5d39688
Update configs/components/oifs/oifs.yaml
mandresm Feb 14, 2025
1795f37
Update configs/components/oifs/oifs.yaml
mandresm Feb 14, 2025
d8bef6d
Update configs/machines/all_machines.yaml
mandresm Feb 14, 2025
4a46584
add mct_version: 2.8 to all the setups that were depending on mct 2.8
mandresm Feb 14, 2025
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
5 changes: 5 additions & 0 deletions configs/components/echam/echam.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ compile_infos:
6.3.05p2-foci_oasismct4:
branch: esm-tools-oasis3mct4
git-repository: https://git.geomar.de/foci/src/echam.git
add_export_vars:
MPEU_Fortran_INCLUDE_DIRECTORIES: "${oasis3mct.model_dir}/INSTALL_OASIS.ESMTOOLS/include"
MPEU_Fortran_LIBRARIES: "${oasis3mct.model_dir}/INSTALL_OASIS.ESMTOOLS/lib"
#MPEU_Fortran_INCLUDE_DIRECTORIES: "/home/shktkeme/esm/models/foci-agrif_mops_oasismct4/oasis/INSTALL_OASIS.ESMTOOLS/include"
#MPEU_Fortran_LIBRARIES: "/home/shktkeme/esm/models/foci-agrif_mops_oasismct4/oasis/INSTALL_OASIS.ESMTOOLS/lib"
6.3.05p2-wiso:
branch: "wiso"
clean_command: rm -rf src/echam/bin; rm -rf bin; make clean
Expand Down
4 changes: 3 additions & 1 deletion configs/components/jsbach/jsbach.datasets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ forcing_sources:
Ndepo_ssp:
# These files are 12-monthly; see README.md in Ndepo/ directory
# NOTE: ssp370 might be missing in this directory
"${input_dir_couple}/${Ndepo_path}1850.nc":
to: 1850
"${input_dir_couple}/${Ndepo_path}@[email protected]":
from: 1850
from: 1851
to: 2099
"${input_dir_couple}/${Ndepo_path}2099.nc":
from: 2100
Expand Down
1 change: 1 addition & 0 deletions configs/components/jsbach/jsbach.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ choose_scenario_is_ssp:
False:
ssp_num: null
Ndepo_sufix: ""
cover_fract_cmip6: cover_fract_hist_scenario

choose_echam.with_wiso:
True:
Expand Down
Loading
Loading