Skip to content
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

Jump to bottom

Merge latest developments from GEOMAR into release #1138

Open
wants to merge 190 commits into
base: release
Choose a base branch
from
Open

Merge latest developments from GEOMAR into release #1138

wants to merge 190 commits into from

Conversation

seb-wahl
Copy link
Contributor

Hi
this will merge mostly FOCIOIFS related developments.
Still contains the bug described by @joakimkjellsson in #1137

seb-wahl and others added 30 commits December 6, 2022 13:12
@seb-wahl
fix previously introduced bug: use correct archfile with AGRIF config…
e7eb2ed 
…urations
@seb-wahl
added AGRIF configuration without AOW tracer
7b7bb1c
@seb-wahl
added missint nemo-ORCA05_LIM2_FOCI_AGRIF+echam-6.3.05p2-foci folder
878539a
@seb-wahl
fix leap year settings
e7a9645
started adding things for Tco399-ORCA12. Also add ln_single_prec_send…
d50db54 
… to runscript
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
8cb5960 
…nto geomar_dev
oifs annual means was not working. Seems ok now.
241de9e
@seb-wahl
bugfixes in monitoring for nemo
95793a2
added runscript for spinup-1950 for foci-openifs
28433db
fix small conflict
c2cf835
@seb-wahl
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
883271a 
…nto geomar_dev
@seb-wahl
added mocsigma and 26.5N AMOC MAX
38b331e
clean up focioifs and fix runoff for AGRIF
4303393
FOCI-OpenIFS-VIKING10 works on glogin with proper runoff remapping
9cdf132
add settings for ORION10X
a39d2d0
@seb-wahl
added a few foci runscript examples
aa6f8e3
@seb-wahl
Merge branch 'release' into geomar_dev
daf3af1
@seb-wahl
added correct nest_refinement for WG10v4
622c93e
@seb-wahl
first draft of eORCA025.z75.SI3, still crashes with diamond shape pat…
d84a490 
…terns of NaN

during the first time step
@seb-wahl
fixed two bugs in nemo postprocessing (date math)
29d55b3
@seb-wahl
added nemo4.2 configuration that ran 3 years using JRA-55 forcing and…
dcc94a8 
… the v1.0.5 Levitus initial data
@seb-wahl
fixed date bugs in nemo_postprocessing.sh
1e35383
@seb-wahl
added test queue on HLRN4 machines
3195b9a
@seb-wahl
Merge pull request #908 from esm-tools/feature/add-eORCA025-standalone
2c399da 
Feature/add eorca025 standalone
@seb-wahl
remove set -vx
6ceb634
@seb-wahl
focioifs-3.0 compiles, won't run as now NEMO4.2 specific adjustments …
6c570a2 
…have been made

updated nemo4 example standalone runscripts.
@seb-wahl
add _nemo4 to compile settings for glogin
4e859e6 
uncomment compiler_mpi in blogin.yaml again
@seb-wahl
fix a typo in blogin.yaml
4126a2e
@seb-wahl
add TCO95_eORCA025 switch
3b77561
change xml files for NEMO4, and add new OpenIFS dev branch for 3.0
743d3dc
joakimkjellsson and others added 30 commits August 29, 2024 08:48
@joakimkjellsson
modify runscripts for FOCI-OpenIFS 4.0 and 3.0-AGRIF for new glogin
438d34d
@joakimkjellsson
Merge branch 'geomar_dev' into feature/blogin-rockylinux9
e713dfd
@joakimkjellsson
Merge pull request #1210 from esm-tools/feature/blogin-rockylinux9
eca8101 
Feature/blogin rockylinux9
@joakimkjellsson
update oifs env for new nesh, and remove mistral settings
50b4295
@joakimkjellsson
switch to new compilers, icc->icx, ifort->ifx
beafb60
@joakimkjellsson
set default nest1: false, instead of no. focioifs.yaml needs to evalu…
9b56521 
…ate nest1 as true or false
@joakimkjellsson
add restart file to restart Tco399+ORCA12 on glogin new nodes
f8ad9dd
added for echam export vars for oasis
3d70939 
changed for nemo from shlat 2 -> 0
nn_closea 1 -> 0
fixed bgc passive tracer definitions
changed the coupling definitions -> oasis version 5.0, xios2.5 r1910
new compiler settings for intel2023_impi2021 (glogin specific with intel_oneapi, maybe this has to be done cleaner?)
increased debug level
some changes to the runscript yaml
@joakimkjellsson
fix small syntax error for nesh.yaml
51c91f2
@joakimkjellsson
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
5472722 
…nto geomar_dev
@pgierz @joakimkjellsson
fix(esm_parser.py): no more complex numbers
527416d
added missing IDEAL tracer definition for FOCI_AGRIF_MOPS configuration
ce1ae1b
Added missing configuration for foci_mops
834cc90
Adapted runscripts to a pre final version -> further test necessary
c23c968
@seb-wahl
Merge remote-tracking branch 'origin/geomar_dev' into geomar
8fbc557
@seb-wahl
Merge remote-tracking branch 'origin/feature/mops_agrif_direct_coupli…
bb0c71c 
…ng' into geomar_dev

merge Tronje's MOPS developments into geomar_dev
@seb-wahl
make FOCI-MOPS work again after the merge of Tronjes and
0716a9f 
Joakims developments, remove a few hardcoded paths
@joakimkjellsson
added some comments on namelist changes for nemo in FOCI-OpenIFS 4.0
afd19f6
@joakimkjellsson
Ladies and Gentlemen! Introducing: FOCI-OpenIFS 4.1 with eORCA05.L75 …
6d97451 
…grid
@seb-wahl
Merge branch 'release' into feature/merge_release_geomar_dev
1b276bd
@seb-wahl
Merge remote-tracking branch 'origin/release' into feature/merge_rele…
63783d3 
…ase_geomar_dev
Added a yaml file to restart ESM simulations with ssp scenarios from …
3d00162 
…2014 with FOCI-MOPS

and added bugfixes to the config files.
@seb-wahl
Merge branch 'geomar_dev' of https://github.com/esm-tools/esm_tools i…
b798691 
…nto geomar_dev
@seb-wahl
Merge branch 'geomar_dev' into geomar
a50f001
@seb-wahl
fixed name pattern for glogin standard96 compute nodes
5c66d73
@seb-wahl
Merge branch 'geomar_dev' into geomar
aca32a9
@TronjeKemena
Update oasis.py
f10a75f 
Bugfix bracket not closed
Added git to the modules. This is no more a standard librabry since t…
73161e6 
…he update.
@seb-wahl
load git-lfs by default as no system git is available anymore
f33fa89
@seb-wahl
fix a merge error in geomar branch
0ce9f6e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mandresm mandresm Awaiting requested review from mandresm

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@seb-wahl @pgierz @joakimkjellsson @TronjeKemena