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.

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

PR to test openacc in main #632

Open
wants to merge 400 commits into
base: openacc_test_main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
400 commits
Select commit Hold shift + click to select a range
06f2ba6
solve merge conflict
patrickscholz Mar 15, 2024
0c7464a
solve merge conflict
patrickscholz Mar 15, 2024
d4efb46
include bugfix about which tracer have to be used to compute the tra…
patrickscholz Mar 15, 2024
7dbd70a
kick out variables tracer%work%dvd_trold and tracer%work%dvd_trAB, th…
patrickscholz Mar 16, 2024
e9bfaf3
introduce trold in dvd as pointer to array tracers%data(tr_num)%valu…
patrickscholz Mar 16, 2024
4660a89
delet some unneccessary comments
patrickscholz Mar 16, 2024
eed2418
change default upper year limits for the JRA55 forcing
patrickscholz Mar 16, 2024
5a6ebee
fix minor bug
patrickscholz Mar 19, 2024
646e0f8
update blowup message
patrickscholz Mar 19, 2024
47eb51b
fix small bug in albedo chain script
patrickscholz Mar 26, 2024
881528f
fix small bug in runscript
patrickscholz Mar 26, 2024
7db4f71
chore(recom): mask hydrothermal vent in Eastern Equatorial Pacific (D…
ogurses Mar 27, 2024
28e8f00
chore(recom): add DIC_PI option and fill Alk_surf
ogurses Apr 2, 2024
ea36797
Merge branch 'refactoring' into refactoring_bugfix_ice_cutoff
JanStreffing Apr 3, 2024
2d8cb38
feat(recom)!: Basic FESOM2.5-REcoM setup with 2p1z1d
ogurses Apr 11, 2024
ced0c99
feat(recom): Add missing MOCSY2.0 files and REcoM diagnostics
ogurses Apr 12, 2024
0a90225
feat(recom)!: FESOM2.5-REcoM version with 2p3z2d
ogurses May 8, 2024
7148caa
feat(recom): FESOM2.5-REcoM version with 3p3z2d
ogurses May 14, 2024
45d00b4
added computation of residual heal flux as proposed by Dmitry Sein.
May 16, 2024
51305ac
fixed bug in realization of residual heat flux
May 23, 2024
4a9b516
add Leonardo and MareNostrum5 platform strategies
trackow May 24, 2024
1b60fe6
Add flushes to fesom
Apr 22, 2024
b23b594
Remove extra flag
May 28, 2024
d69968c
Prevent fesom crashes when running with 0 multio servers
May 28, 2024
d85a386
Merge pull request #592 from raguridan/updates_2.5.0.4_de
trackow May 28, 2024
d731406
Merge branch 'refactoring' into refactoring_bugfix_ice_cutoff
JanStreffing May 29, 2024
d5f9f8a
feat(recom): Add ballasting, OmegaC dependent calcite dissolution,
ogurses May 30, 2024
4232da8
Merge branch 'refactoring' into refac_recom
JanStreffing May 30, 2024
e7ee547
after long discussions with Dmitry Sein, Sergey Danilov & Sveta here …
Jun 6, 2024
640645c
Fix circular module dependency
Jun 6, 2024
c6e8e01
Only call multio if supported
Jun 6, 2024
7aded4d
Merge pull request #595 from raguridan/fix/circular-dependency
trackow Jun 7, 2024
156b2ee
Merge branch 'refactoring' into refac_recom
JanStreffing Jun 10, 2024
dc4d463
Update CMakeLists.txt
pgierz Jun 10, 2024
92e94fb
Remove PARMS solver
Jun 10, 2024
7849ff8
Merge pull request #571 from FESOM/production_DE
patrickscholz Jun 11, 2024
c507c1d
Merge branch 'refactoring' into remove_PARMS
JanStreffing Jun 11, 2024
86df473
Merge branch 'refactoring' into refactoring_better_metadata
JanStreffing Jun 11, 2024
1c4cedb
Merge pull request #354 from FESOM/refactoring_better_metadata
JanStreffing Jun 11, 2024
b01be5b
solver merging conflicts from merging merging with refactoring branch
patrickscholz Jun 14, 2024
596c71f
solve conflict
patrickscholz Jun 14, 2024
d6769f4
change some paths, remove ollie and mistral as HPCs are long gone
JanStreffing Jun 14, 2024
986c0e6
name not path
JanStreffing Jun 14, 2024
5aca76d
typo
JanStreffing Jun 14, 2024
5db791b
Merge pull request #598 from FESOM/refactoring_default_paths
JanStreffing Jun 14, 2024
63fb9f7
Merge branch 'refactoring' into remove_PARMS
JanStreffing Jun 14, 2024
f829f07
stream for the forcing output bundle was defined twice
patrickscholz Jun 14, 2024
11db3a7
update gitignore
JanStreffing Jun 14, 2024
5263f9c
Merge branch 'refactoring' into refactoring_addsshsubcycl
JanStreffing Jun 14, 2024
837a775
Merge branch 'refactoring' into refactoring_bugfix_iomean
JanStreffing Jun 14, 2024
35aa899
Merge branch 'refactoring' into refactoring_bugfix_ice_cutoff
JanStreffing Jun 14, 2024
dcd2925
Merge branch 'refactoring' into ice_fct_screening
JanStreffing Jun 14, 2024
17168c9
Merge pull request #599 from FESOM/refactoring_bugfix_iomean
JanStreffing Jun 14, 2024
586d022
Fix FESOM compilation on Cray compilers
Jun 18, 2024
f8bf022
Merge pull request #602 from raguridan/fix/cray-compilation-issues
JanStreffing Jun 18, 2024
05bd3d0
fix landice fw bug
ackerlar Jun 18, 2024
c1e17a3
Merge pull request #603 from FESOM/fix/landice_fw_bug
JanStreffing Jun 18, 2024
88b9642
fix missing/miss placed allocation
ackerlar Jun 19, 2024
94c96d1
Merge branch 'refactoring' into fix/allocation_bug
JanStreffing Jun 19, 2024
6bf98ba
Merge pull request #604 from FESOM/fix/allocation_bug
ackerlar Jun 19, 2024
a13bc54
ci: change testing container to the one hosted in github container re…
pgierz Jun 20, 2024
ae733f0
ci: wrong branch name on container
pgierz Jun 20, 2024
a7d8caa
rebase and remove old commits
pgierz Jun 20, 2024
262b9b5
builds on levante
pgierz Jun 20, 2024
d1ff2e6
enables traceback on errors
pgierz Jun 20, 2024
1c74c7f
enables backtrace
pgierz Jun 20, 2024
b48a653
enables backtrace 2
pgierz Jun 20, 2024
7eafa24
Merge branch 'refactoring' into refactoring_qres
Jun 26, 2024
c4a89ae
setting default for tracers/AB_order = 2 in oce_setup_step.F90
dsidoren Jun 28, 2024
7028049
Merge pull request #608 from FESOM/dsidoren-patch-1
JanStreffing Jun 28, 2024
904860c
drop an error message if AB_order for tracers is ridiculous
Jun 28, 2024
3e08c5a
Merge branch 'main' of https://github.com/FESOM/fesom2
Jun 28, 2024
bfb192c
drop an error message for ridiculous values for AB_order in oce_trace…
dsidoren Jun 28, 2024
b83cfe2
Merge branch 'refactoring_qres'
Jun 28, 2024
e32ce80
Merge pull request #609 from FESOM/dsidoren-patch-1
JanStreffing Jun 28, 2024
8c6b15a
Update README.md
JanStreffing Jul 2, 2024
8e7e1a6
Merge branch 'main' of https://github.com/FESOM/fesom2
Jul 10, 2024
fb06ccb
Redo ozgures leapyear problem: (ii) make choice of calendar settings…
patrickscholz Jul 12, 2024
43f67b8
clean up a bit after ickecked that the results resume the same when c…
patrickscholz Jul 15, 2024
bd50131
Merge branch 'main' into refactoring_improve4ogurses_calendar_new
JanStreffing Jul 15, 2024
eecc017
Merge pull request #613 from FESOM/refactoring_improve4ogurses_calend…
JanStreffing Jul 15, 2024
ac44b33
fix ib fw flux
ackerlar Jul 22, 2024
0053c07
set correct unit for ib heat flux
ackerlar Jul 22, 2024
e98f4bc
Merge branch 'main' into fix/ib_fw_flux
JanStreffing Jul 22, 2024
7b801dc
Merge pull request #614 from FESOM/fix/ib_fw_flux
ackerlar Jul 22, 2024
626a371
Added export command in env.sh to recitify 'Not found blas' for cpu c…
Jul 25, 2024
16b29db
Merge branch 'main' into remove_PARMS
JanStreffing Jul 26, 2024
26ad762
update ci test truth after removal of parms solver
JanStreffing Jul 26, 2024
c3b0bb0
update channel setup ci test truth after removal of parms solver
JanStreffing Jul 26, 2024
cdc3309
update channel setup ci test truth after removal of parms solver
JanStreffing Jul 26, 2024
f59e8c1
Merge pull request #597 from FESOM/remove_PARMS
JanStreffing Jul 26, 2024
af42b8e
Merge branch 'main' into refactoring_bugfix_ice_cutoff
JanStreffing Jul 26, 2024
2eab17b
update pi setup truth after bugfix_ice_cutoff
JanStreffing Jul 26, 2024
d6cbab8
Merge pull request #377 from FESOM/refactoring_bugfix_ice_cutoff
koldunovn Jul 26, 2024
195ae8d
Merge branch 'main' into ice_fct_screening
JanStreffing Jul 26, 2024
2e80ee9
Merge branch 'main' into refactoring_bugfix_hnode_in_Trz_and_difveR_w…
JanStreffing Jul 26, 2024
ad5ed1e
Merge branch 'main' into JanStreffing-patch-1
koldunovn Jul 26, 2024
3885df3
update pi setup truth after bugfix_hnode_in_Trz_and_difveR_which_tr_i…
JanStreffing Jul 26, 2024
80a7660
update souf channel setup truth after bugfix_hnode_in_Trz_and_difveR_…
JanStreffing Jul 26, 2024
b5e42d6
Merge pull request #610 from FESOM/JanStreffing-patch-1
JanStreffing Jul 26, 2024
8279f49
Merge branch 'main' into refactoring_bugfix_hnode_in_Trz_and_difveR_w…
JanStreffing Jul 26, 2024
077431a
Merge pull request #575 from FESOM/refactoring_bugfix_hnode_in_Trz_an…
JanStreffing Jul 26, 2024
06b805b
Merge branch 'main' into ice_fct_screening
JanStreffing Jul 26, 2024
47c57a9
update pi setup truth afer ice_fct_screening bugfix
JanStreffing Jul 26, 2024
a333397
Merge pull request #86 from FESOM/ice_fct_screening
JanStreffing Jul 26, 2024
d169703
Merge branch 'main' into main_ifs_thermo
JanStreffing Jul 26, 2024
ae0e3bb
Bugfix: Reintroduce auxiliary latitude variables for transient tracer…
mbutzin Aug 15, 2024
a7055cf
Merge branch 'main' into refactoring_gitignore
JanStreffing Aug 15, 2024
5c8b780
Merge pull request #616 from FESOM/mbutzin_patch_transit
JanStreffing Aug 15, 2024
db84c17
Remove checkout refactoring from getting_started.rst
sebastianbeyer Aug 15, 2024
00e54b0
Merge pull request #618 from FESOM/sebastianbeyer-update_doc
JanStreffing Aug 15, 2024
11167b6
Merge branch 'main' into updates_2.5.0.4_de
JanStreffing Aug 16, 2024
e844fc0
Merge branch 'main' into refactoring_addDVDsergeyandknut
JanStreffing Aug 16, 2024
4b41980
Update io_meandata.F90
JanStreffing Aug 16, 2024
4d5a3f1
Merge branch 'main' into refactoring_addsshsubcycl
JanStreffing Aug 16, 2024
d322f21
Update gen_model_setup.F90
JanStreffing Aug 16, 2024
2a68b33
Merge pull request #497 from FESOM/refactoring_addsshsubcycl
JanStreffing Aug 16, 2024
e835f5a
Update gen_modules_diag.F90
JanStreffing Aug 16, 2024
9f05cbc
Merge branch 'main' into updates_2.5.0.4_de
sebastianbeyer Aug 16, 2024
dbb2512
Update gen_modules_diag.F90
JanStreffing Aug 16, 2024
986ad35
hopefully fixing OMP issue in oce_adv_tra_driver.F90
JanStreffing Aug 16, 2024
62d167c
Merge branch 'main' into refactoring_addDVDsergeyandknut
JanStreffing Aug 16, 2024
49d914c
Update oce_adv_tra_driver.F90
JanStreffing Aug 16, 2024
2f0f60d
playing around with OMP to compile
dsidoren Aug 19, 2024
04ece32
playing around with OMP 2
dsidoren Aug 19, 2024
e437467
playing around with OMP 3
dsidoren Aug 19, 2024
581e1b0
playing around with OMP & GPT
dsidoren Aug 19, 2024
c1d078e
Playing around with OMP final part
JanStreffing Aug 19, 2024
191ef67
Merge pull request #578 from FESOM/refactoring_addDVDsergeyandknut
JanStreffing Aug 19, 2024
9e47cf6
Merge branch 'main' into workbench_fixsrfstress
JanStreffing Aug 19, 2024
2eb1d7f
Merge branch 'main' into updates_2.5.0.4_de
JanStreffing Aug 19, 2024
0c5e307
Merge pull request #619 from FESOM/updates_2.5.0.4_de
JanStreffing Aug 19, 2024
2489da2
Merge branch 'main' into workbench_fixsrfstress
JanStreffing Aug 19, 2024
f3b4732
Merge branch 'main' into main_ifs_thermo
JanStreffing Aug 19, 2024
46759d2
adjust pi test truth
JanStreffing Aug 20, 2024
4ee8400
Merge pull request #612 from FESOM/main_ifs_thermo
JanStreffing Aug 20, 2024
a576e48
Recom shall be off by default. Can be turned on though via compile fl…
JanStreffing Aug 20, 2024
e36ed15
adding recom preprocessor flags around recom namelist flags
JanStreffing Aug 20, 2024
8361cab
Merge branch 'main' into workbench_fixsrfstress
JanStreffing Aug 20, 2024
65b5022
update pi setup truth after fixsrfstress
JanStreffing Aug 20, 2024
e6ba16b
fix bug in pi setup truth after fixsrfstress, had added diff instead …
JanStreffing Aug 20, 2024
ccee202
Merge pull request #120 from FESOM/workbench_fixsrfstress
JanStreffing Aug 20, 2024
a22e596
Merge branch 'main' into refactoring_gitignore
patrickscholz Aug 21, 2024
988f0c5
Merge branch 'main' into refac_recom
patrickscholz Aug 21, 2024
57c93d5
Update gen_surface_forcing.F90
patrickscholz Aug 21, 2024
87687a9
Update gen_surface_forcing.F90
patrickscholz Aug 21, 2024
8adfce8
Update io_meandata.F90
patrickscholz Aug 21, 2024
a633830
Update fesom2_openmp.yml
patrickscholz Aug 21, 2024
cd1a079
Update fesom2_openmp.yml
patrickscholz Aug 21, 2024
24c9909
Update pi truth after switching gfortran compiler version for CI
JanStreffing Aug 21, 2024
b9fe855
Merge pull request #600 from FESOM/refactoring_gitignore
patrickscholz Aug 21, 2024
3fdbaaa
Merge branch 'main' into refac_recom
JanStreffing Aug 21, 2024
1bb651f
trying nightly docker tag
JanStreffing Aug 21, 2024
11eeb70
Merge pull request #583 from FESOM/refac_recom
patrickscholz Aug 21, 2024
82d3639
Update namelist.io
JanStreffing Aug 27, 2024
f7dcdfb
Merge pull request #622 from FESOM/compression_by_default
JanStreffing Aug 27, 2024
95d0df6
Update gen_surface_forcing.F90
patrickscholz Aug 27, 2024
eb8f8e5
Merge pull request #623 from FESOM/patrickscholz-patch-1
JanStreffing Aug 27, 2024
74c5680
include DVD from surface boundary condition and short wave penetratio…
patrickscholz Aug 27, 2024
405af58
combine if condition
patrickscholz Aug 27, 2024
35e2060
Merge branch 'main' into refactoring_addDVDsergeyandknut_02
JanStreffing Aug 27, 2024
6592c46
add diagnostic to compute squared velocities for (u,v,w) , to compute…
patrickscholz Aug 27, 2024
93a96e7
solve conflicts
patrickscholz Aug 27, 2024
2a6ef1c
fix openmp error message
patrickscholz Aug 28, 2024
2921aa5
fix small bug in the DVD komponent of the horizontal redi komponent
patrickscholz Aug 30, 2024
3d9ebb3
improve work/job_albedo_chain file, save file_chain_id in results fol…
patrickscholz Aug 30, 2024
d8fc39e
fix gnu compiler error
patrickscholz Sep 2, 2024
ec1223d
fix gnu compiler error
patrickscholz Sep 2, 2024
59f9b2b
Merge pull request #624 from FESOM/refactoring_addDVDsergeyandknut_02
patrickscholz Sep 2, 2024
0e5bfdc
update mpif.h to use mpi
Sep 16, 2024
361b9b9
3D heat flux, fix cell saturation
ackerlar Sep 20, 2024
bd16404
Merge branch 'main' into refactoring_blas_bug_fix
JanStreffing Sep 23, 2024
a560e74
Merge pull request #627 from FESOM/update_mpi
JanStreffing Sep 24, 2024
e5c1c79
Merge branch 'main' into refactoring_blas_bug_fix
Sep 24, 2024
5d4473d
Removed the unnecessary exports in shell.gnu and shell.intel
Sep 24, 2024
59b3f64
Update env.sh
basava70 Sep 24, 2024
e900ff0
Merge pull request #615 from FESOM/refactoring_blas_bug_fix
JanStreffing Sep 24, 2024
d1ba3f2
delete unused files
Sep 22, 2024
44ec629
remove old files
pgierz Sep 25, 2024
ca9b39a
enable icebergs with cavities
ackerlar Sep 27, 2024
ec878cb
add module for icb_thermo and icb_coupling
ackerlar Sep 27, 2024
c8f287a
avoid unneccesary loop
ackerlar Sep 27, 2024
d7e1246
Merge branch 'main' into fix/ib_flx_cpling
JanStreffing Sep 28, 2024
bfee944
fix segfault
ackerlar Oct 7, 2024
6a61693
Merge branch 'fix/ib_flx_cpling' of https://github.com/FESOM/fesom2 i…
ackerlar Oct 7, 2024
aff740d
try to make icepack to compile. Try to preliminary fix the icepack r…
patrickscholz Oct 7, 2024
a66454e
add old icepack debug changes into ice_oce_coupling.F90
patrickscholz Oct 7, 2024
97d2441
bug fix: use_cavity_fw2press does not work
Oct 8, 2024
acf43fc
Merge branch 'main' into refactoring_bugfix_cavity
patrickscholz Oct 8, 2024
fe4330e
Merge pull request #633 from FESOM/refactoring_bugfix_cavity
patrickscholz Oct 8, 2024
3a5d6ba
Revert "update mpif.h to use mpi"
JanStreffing Oct 8, 2024
531fcec
Merge pull request #634 from FESOM/revert_update_mpi
JanStreffing Oct 8, 2024
b26d7bd
Merge branch 'main' into fix/ib_flx_cpling
JanStreffing Oct 8, 2024
f6e04d6
fix segfault, really...
ackerlar Oct 8, 2024
d3aca8b
update mpif.h to use mpi
Sep 16, 2024
ed87d98
add use mpi to cpl_driver
Oct 8, 2024
7445768
small fix
ackerlar Oct 9, 2024
35974e2
Merge pull request #628 from FESOM/fix/ib_flx_cpling
JanStreffing Oct 9, 2024
3252603
Merge branch 'main' into update_mpi_again
JanStreffing Oct 9, 2024
da877f3
switch defalt icepack update ocean fluxes to true
patrickscholz Oct 9, 2024
e62e2c2
make icepack restart work for the moment
patrickscholz Oct 9, 2024
2d0b474
add icepack bugfix from ancient debugging round in 2021, Problem in …
patrickscholz Oct 9, 2024
9be15d9
change commRank type to integer
ackerlar Oct 10, 2024
5d1f98a
Merge pull request #635 from FESOM/update_mpi_again
JanStreffing Oct 10, 2024
edabc9f
Merge branch 'main' into clean_up_repo
JanStreffing Oct 10, 2024
15a2ba4
make last changes so that icepack is fully volume conserving under z…
patrickscholz Oct 10, 2024
2efe5b0
add openmp loop in ice_oce_:coupling.F90, delete uneccessary comment …
patrickscholz Oct 11, 2024
fcf69bb
fix silly misstake...
ackerlar Oct 13, 2024
b5cef00
write out 3D icb heat flux
ackerlar Oct 13, 2024
e9a4586
Merge pull request #636 from FESOM/fix/ibhf_vertical_mean
JanStreffing Oct 15, 2024
cd374e7
fix icepack io_mean variable writing + fix and improve restart writi…
patrickscholz Oct 15, 2024
bfea5f1
add some comments
patrickscholz Oct 15, 2024
6951b11
sort and structure icepack io meandata output routine
patrickscholz Oct 16, 2024
1de84cd
make sure the io mean routine is able to write an array for the ncat…
patrickscholz Oct 16, 2024
dbb76f8
reduce number of def_nod_var subroutines, make ncat index an optional…
patrickscholz Oct 16, 2024
4a5d97d
fix the icepack netcdf restart, add additional restart variables, now…
patrickscholz Oct 18, 2024
4d344d9
Merge branch 'main' into workbench_mainf26_icepack
patrickscholz Oct 18, 2024
5801e27
fix minor issue
patrickscholz Oct 18, 2024
cb6e281
Merge branch 'workbench_mainf26_icepack' of https://github.com/FESOM/…
patrickscholz Oct 18, 2024
d9a4ae5
change default ICEPACK branch in download_icepack.sh from icepack_fes…
patrickscholz Oct 18, 2024
f65da84
solve icb related segfault
ackerlar Oct 20, 2024
7f374ae
Merge pull request #638 from FESOM/fix/icb_segfault
ackerlar Oct 21, 2024
203a3f4
Merge branch 'main' into workbench_mainf26_icepack
JanStreffing Oct 21, 2024
367d333
Merge pull request #637 from FESOM/workbench_mainf26_icepack
JanStreffing Oct 21, 2024
804c3b7
Merge branch 'main' into clean_up_repo
patrickscholz Oct 21, 2024
0047a67
Merge pull request #630 from FESOM/clean_up_repo
JanStreffing Oct 21, 2024
9897294
fix MPI_ABORT in oifs context after change to use mpi
Oct 21, 2024
3b9c8ed
Merge pull request #640 from FESOM/fix/partitioner_oifs_mpi
JanStreffing Oct 21, 2024
55f1b77
add icebergs namelist section to namelist.config.toy_soufflet, other…
patrickscholz Oct 25, 2024
93aebcb
Merge pull request #641 from FESOM/workbench_fixchannel
JanStreffing Oct 25, 2024
9c16aa0
treat icb heat flux as heat source per layer and remove outgoing heat…
ackerlar Oct 30, 2024
3087528
Merge branch 'main' into fix/ibhf_ocea_ale_tra
ackerlar Oct 30, 2024
8231e55
Merge pull request #645 from FESOM/fix/ibhf_ocea_ale_tra
JanStreffing Oct 31, 2024
3be7e6e
add iceberg output to blowup info
ackerlar Nov 7, 2024
b6dc7e0
add wave erosion potential to just account for wave erosion if upper …
ackerlar Nov 7, 2024
32453f1
Remove superfluous 'use MOD_PARSUP' from clock_init
Nov 11, 2024
beaf7cc
Merge branch 'main' into fix/wave_erosion
ackerlar Nov 15, 2024
159e969
Merge pull request #648 from FESOM/bugfix/remove_uneeded_mod_parsup
JanStreffing Nov 22, 2024
7051597
Merge branch 'main' into fix/wave_erosion
ackerlar Nov 25, 2024
b6e661c
Merge pull request #649 from FESOM/fix/wave_erosion
ackerlar Nov 25, 2024
ebe7709
Improve error handling for open files for clock file and mesh file
Oct 26, 2024
01d4329
Merge pull request #642 from FESOM/improve_error_handling_file_open
JanStreffing Dec 4, 2024
6300635
Fix compilation on LUMI with cray 16.0.1
Dec 10, 2024
8240a52
Merge pull request #655 from FESOM/fix_lumi_compile
JanStreffing Dec 10, 2024
392bc3d
Update io_meandata.F90
JanStreffing Dec 10, 2024
77d711c
Update io_meandata.F90
JanStreffing Dec 10, 2024
1ed23d4
Merge pull request #657 from FESOM/JanStreffing-patch-1
JanStreffing Dec 10, 2024
b8e8d6f
Update multio API to latest version
Jun 11, 2024
e6d212a
with Sebastian we addec computation of snow and ice thickness over th…
dsidoren Dec 17, 2024
e9f2f17
Merge pull request #658 from FESOM/fesom2_addIO
dsidoren Dec 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 7 additions & 1 deletion .github/workflows/fesom2.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# Containers must run in Linux based operating systems
runs-on: ubuntu-latest
# Docker Hub image that `container-job` executes in
container: koldunovn/fesom2_test:refactoring2
container: ghcr.io/fesom/fesom2_docker:fesom2_test_refactoring-master

# Service containers to run with `gfortran_ubuntu`
steps:
Expand Down Expand Up @@ -69,6 +69,12 @@ jobs:
run: |
cd work_pi
fcheck .
- name: Check UGRID Compliance
run: |
pip install ugrid-checks xarray
# Needed to combine the mesh diag and output
python3 -c "import xarray as xr; ds1 = xr.open_dataset('./test/output_pi/sst.fesom.1948.nc'); ds2 = xr.open_dataset('./test/output_pi/fesom.mesh.diag.nc'); xr.merge([ds1, ds2]).to_netcdf('./test/output_pi/merged_ugrid_check.nc')"
ugrid-checker ./test/output_pi/merged_ugrid_check.nc

- name: Check restarts
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fesom2_openmp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# Containers must run in Linux based operating systems
runs-on: ubuntu-latest
# Docker Hub image that `container-job` executes in
container: koldunovn/fesom2_test:refactoring2
container: ghcr.io/fesom/fesom2_docker:fesom2_test_refactoring-nightly

# Service containers to run with `gfortran_ubuntu`
steps:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/build
/build.lib
/work
/lib64
*.o
*.mod
*.x
Expand All @@ -12,3 +14,4 @@ lib/*.so
/work_*
Makefile.in
mesh_part/build
test/output_pi
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ set(OIFS_COUPLED OFF CACHE BOOL "compile fesom coupled to OpenIFS. (Also needs F
set(CRAY OFF CACHE BOOL "compile with cray ftn")
set(USE_ICEPACK OFF CACHE BOOL "compile fesom with the Iceapck modules for sea ice column physics.")
set(OPENMP_REPRODUCIBLE OFF CACHE BOOL "serialize OpenMP loops that are critical for reproducible results")
set(RECOM_COUPLED OFF CACHE BOOL "compile fesom including biogeochemistry, REcoM3")
set(CISO_COUPLED OFF CACHE BOOL "compile ciso coupled to REcoM3. RECOM_COUPLED has to be active")
set(USE_MULTIO OFF CACHE BOOL "Use MULTIO for IO, either grib or binary for now. This also means path to MULTIO installation has to provided using env MULTIO_INSTALL_PATH='..' and multio configuration yamls must be present to run the model with MULTIO")
set(OASIS_WITH_YAC OFF CACHE BOOL "Useing a version of OASIS compiled with YAC instead of SCRIP for interpolation?")
set(ASYNC_ICEBERGS ON CACHE BOOL "compile fesom with or without support for asynchronous iceberg computations")
Expand Down
38 changes: 0 additions & 38 deletions Makefile

This file was deleted.

45 changes: 0 additions & 45 deletions Makefile.in_gnu_impi

This file was deleted.

45 changes: 0 additions & 45 deletions Makefile.in_intel

This file was deleted.

9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,3 @@ References
* **[Version with ICEPACK sea ice thermodynamics]** Zampieri, Lorenzo, Frank Kauker, Jörg Fröhle, Hiroshi Sumata, Elizabeth C. Hunke, and Helge Goessling. Impact of Sea-Ice Model Complexity on the Performance of an Unstructured-Mesh Sea-ice/ocean Model Under Different Atmospheric Forcings. Washington: American Geophysical Union, 2020. https://dx.doi.org/10.1002/essoar.10505308.1.

* **[Version coupled with OpenIFS atmosphere]** Streffing, J., Sidorenko, D., Semmler, T., Zampieri, L., Scholz, P., Andrés-Martínez, M., et al ( 2022). AWI-CM3 coupled climate model: description and evaluation experiments for a prototype post-CMIP6 model. Geoscientific Model Development, 15. https://doi.org/10.5194/gmd-15-6399-2022

Documentation for FESOM2
************************

Here lives FESOM2 documentation

Rendered version: https://fesom2.readthedocs.io/en/latest/


66 changes: 66 additions & 0 deletions config/bin_2p1z1d/job_albedo
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#!/bin/bash
#SBATCH --account=nwg_hauck.maresys # edit your account
#SBATCH --job-name=recom
#SBATCH --partition=mpp
#SBATCH --time=01:30:00
####SBATCH --constraint="[rack1|rack3]"
#SBATCH --qos=12h
#SBATCH --nodes=9 # Number of tasks (MPI) tasks to be launched
#SBATCH --tasks-per-node 96 #8 #4 # using all 128CPus we exceed the maxload limit (>130) of many used nodes when us parallel I/O
#SBATCH --cpus-per-task 1

#SBATCH -o fesom2o.out
#SBATCH -e fesom2e.out

# disable hyperthreading
#SBATCH --hint=nomultithread

module purge
source ../env/albedo/shell
export OMP_NUM_THREADS=1
ulimit -s unlimited

# determine JOBID
JOBID=`echo $SLURM_JOB_ID |cut -d"." -f1`

ln -s ../bin/fesom.x . # cp -n ../bin/fesom.x
cp -n ../config/namelist.config .
cp -n ../config/namelist.forcing .
cp -n ../config/namelist.oce .
cp -n ../config/namelist.dyn .
cp -n ../config/namelist.tra .
cp -n ../config/namelist.ice .
cp -n ../config/namelist.io .
cp -n ../config/namelist.icepack .

#___DETERMINE SLURM JOBID+OUTPUTFILE____________________________________________
jobid=$(echo $SLURM_JOB_ID | cut -d"." -f1)
fname="fesom2_${SLURM_JOB_NAME}_${jobid}.out"

#___PUT JOB IN QUEUE____________________________________________________________
date
####srun --mpi=pmi2 ./fesom.x >> ${fname}
srun --mpi=pmi2 ./fesom.x > fesom2.0.out
date

#qstat -f $PBS_JOBID
#export EXITSTATUS=$?
#if [ ${EXITSTATUS} -eq 0 ] || [ ${EXITSTATUS} -eq 127 ] ; then
#sbatch job_ollie
#fi

#Resultpath='/albedo/scratch/user/ogurses/ocean_only/'
Resultpath='/albedo/scratch/user/ogurses/fesom2.5_recom_st1_vsink_vben_diags/'
test -d $Resultpath/fesom.2019.oce.restart && exit

IsInFile=$( tail -3 fesom2.0.out | grep -c timesteps)
if (( IsInFile > 0 )); then
# submit next #job \
echo "submitting next job"
cp fesom2.0.out fesom.out.done
sbatch job_albedo
else
echo "something is wrong, last line of fesom.out reads"
echo $( tail -1 fesom2.0.out)
echo "abnormal termination of job script"
fi
67 changes: 67 additions & 0 deletions config/bin_2p1z1d/namelist.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
! This is the namelist file for model general configuration

&modelname
runid='fesom'
/

&timestep
step_per_day=32 !96 !96 !72 !72 !45 !72 !96
run_length=1 !62 !62 !62 !28
run_length_unit='y' ! y, m, d, s
/

&clockinit ! the model starts at
timenew=0.0
daynew=1
yearnew=1958
/

&paths
MeshPath='/albedo/work/projects/p_recompdaf/frbunsen/FESOM2/meshes/core2/'
ClimateDataPath='/albedo/work/projects/MarESys/ogurses/input/corrected_input/'
ResultPath='/albedo/scratch/user/ogurses/fesom2.5_recom_st1_vsink_vben_diags/'
/

&restart_log
restart_length=1 ! --> do netcdf restart ( only required for d,h,s cases, y, m take 1)
restart_length_unit='y' !output period: y, d, h, s, off
raw_restart_length=1 ! --> do core dump restart
raw_restart_length_unit='off' ! e.g. y, d, h, s, off
bin_restart_length=1 ! --> do derived type binary restart
bin_restart_length_unit='off' ! e.g. y, d, h, s, off
logfile_outfreq=960 !in logfile info. output frequency, # steps
/

&ale_def
which_ALE='zstar' ! 'linfs','zlevel', 'zstar'
use_partial_cell=.true.
/

&geometry
cartesian=.false.
fplane=.false.
cyclic_length=360 ![degree]
rotated_grid=.true. !option only valid for coupled model case now
force_rotation=.true.
alphaEuler=50. ![degree] Euler angles, convention:
betaEuler=15. ![degree] first around z, then around new x,
gammaEuler=-90. ![degree] then around new z.
/

&calendar
include_fleapyear=.false.
/

&run_config
use_ice=.true. ! ocean+ice
use_cavity=.false. !
use_cavity_partial_cell=.false.
use_floatice = .false.
use_sw_pene=.true.
flag_debug=.false.
/

&machine
n_levels=2
n_part= 12, 36 ! 432 number of partitions on each hierarchy level
/
24 changes: 24 additions & 0 deletions config/bin_2p1z1d/namelist.dyn
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
&dynamics_visc
visc_gamma0 = 0.003 ! [m/s], backgroung viscosity= gamma0*len, it should be as small a s possible (keep it < 0.01 m/s).
visc_gamma1 = 0.1 ! [nodim], for computation of the flow aware viscosity
visc_gamma2 = 0.285 ! [s/m], is only used in easy backscatter option
visc_easybsreturn= 1.5

opt_visc = 5
! 5=Kinematic (easy) Backscatter
! 6=Biharmonic flow aware (viscosity depends on velocity Laplacian)
! 7=Biharmonic flow aware (viscosity depends on velocity differences)
! 8=Dynamic Backscatter

use_ivertvisc= .true.
/

&dynamics_general
momadv_opt = 2 ! option for momentum advection in moment only =2
use_freeslip = .false. ! Switch on free slip
use_wsplit = .false. ! Switch for implicite/explicte splitting of vert. velocity
wsplit_maxcfl= 1.0 ! maximum allowed CFL criteria in vertical (0.5 < w_max_cfl < 1.)
! in older FESOM it used to be w_exp_max=1.e-3
ldiag_KE=.false. ! activates energy diagnostics
/

Loading
Loading