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

Feat/awicm3.2 #1056

Merged
merged 35 commits into from
Oct 19, 2023
Merged

Feat/awicm3.2 #1056

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a609575
wip towards awicm 3.1.3
JanStreffing Jul 12, 2023
0655fb5
working awicm3.1.3, need to check namelists still
JanStreffing Jul 13, 2023
92caf23
Merge branch 'release' into feat/awicm3.1.3
JanStreffing Jul 13, 2023
22b9cf7
switch for aerscaling works
JanStreffing Jul 13, 2023
57a345a
monthly 3d salt and temp output by default
JanStreffing Jul 21, 2023
5a458c5
merge symlink fix
JanStreffing Aug 1, 2023
9409a0c
Merge remote-tracking branch 'origin/release' into feat/awicm3.1.3
JanStreffing Aug 7, 2023
61140c1
change v3.1.3 into v3.2
JanStreffing Aug 31, 2023
bfdca15
fix typo
JanStreffing Aug 31, 2023
df3c905
add missing ocean fields
JanStreffing Aug 31, 2023
20aa184
update awicm3.2
JanStreffing Aug 31, 2023
f1d3268
namelists for v3.2
JanStreffing Aug 31, 2023
80ab5dd
adding tuning for awicm3 v3.2
JanStreffing Sep 20, 2023
e4514a9
v3.2 example script
JanStreffing Sep 20, 2023
bd00821
move NAERANT_SCALE to major version
JanStreffing Sep 21, 2023
4c526af
moved configs to major version, moved default awicm3 v3.2 namelist fo…
JanStreffing Sep 21, 2023
dbd2a3b
cleanup
JanStreffing Sep 21, 2023
3bc96f9
fix typo
JanStreffing Sep 21, 2023
76e8f58
attempt to switch to fesom 2.5 yaml file
JanStreffing Oct 16, 2023
1af9704
Merge remote-tracking branch 'origin/release' into feat/awicm3.2
JanStreffing Oct 16, 2023
edb3155
testing cavities
JanStreffing Oct 18, 2023
382cf85
adding inout namelist changes
JanStreffing Oct 18, 2023
a94505d
working v3.2
JanStreffing Oct 18, 2023
ef7bf90
adding example script for v3.2
JanStreffing Oct 18, 2023
8951641
adding xml output config for cavity run
JanStreffing Oct 18, 2023
e245d44
ensure we automatically get the right branches
JanStreffing Oct 18, 2023
784ab61
oifs 3.1.3 not 3.1.2 for awicm 3.2
JanStreffing Oct 18, 2023
0f540b4
get correct commit for oifs
JanStreffing Oct 18, 2023
a79e99f
safty slash
JanStreffing Oct 19, 2023
336bc53
use 3.2 tag instead of commit hash
JanStreffing Oct 19, 2023
8c7c525
remove ocean current coupling from frontiers-xios branch, where it wa…
JanStreffing Oct 19, 2023
e1b2b3e
Update pre-merge_actions.yml
mandresm Oct 19, 2023
c55b0a4
Merge branch 'release' into feat/awicm3.2
mandresm Oct 19, 2023
e99fe5e
Merge branch 'release' into feat/awicm3.2
mandresm Oct 19, 2023
b1a70fa
Bump version: 6.24.5 → 6.25.0
Oct 19, 2023
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
547 changes: 547 additions & 0 deletions configs/components/fesom/fesom-2.5.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions configs/components/oifs/oifs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ compile_infos:
- 43r3-awicm-3.1
- 43r3-awicm-3.1.1
- 43r3-awicm-3.1.2
- 43r3-awicm-3.1.3
- 43r3-awicm-frontiers-xios
- 43r3
- 40r1-foci
Expand Down Expand Up @@ -159,6 +160,15 @@ compile_infos:
install_bins: make/esm/oifs/bin/oifs
destination: oifs-43r3
with_xios: true
43r3-awicm-3.1.3:
requires:
- oasis3mct-4.0-awicm-3.1
branch: awicm-3.1.3
comp_command: "export OIFS_TOPLEVEL_DIR=${model_dir}; export OIFS_XIOS=enable ; export OIFS_XIOS_DIR=${model_dir}/../xios ; export OIFS_XIOS_INCLUDE=-I/${model_dir}/../xios/inc/; cd make; ../fcm/bin/fcm make -v -j8 -f oifs.fcm ; chmod -R ${source_code_permissions} .; mv esm/oifs/bin/master.exe esm/oifs/bin/oifs"
git-repository: https://gitlab.dkrz.de/ec-earth/oifs-43r3.git
install_bins: make/esm/oifs/bin/oifs
destination: oifs-43r3
with_xios: true
43r3-awicm-frontiers-xios:
requires:
- oasis3mct-4.0-awicm-frontiers
Expand Down
11 changes: 11 additions & 0 deletions ...gs/fesom-2.5+oifs-43r3-awicm-3.1.3+xios-2.5/fesom-2.5+oifs-43r3-awicm-3.1.3+xios-2.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
components:
- xios-2.5
- rnfmap-awicm-3.1
- oifs-43r3-awicm-3.1.2
- fesom-2.5
- oasis3mct-4.0-awicm-3.1
coupling_changes:
- sed -i '/COUPLENEMOECE = /s/.TRUE./.FALSE./g' oifs-43r3/src/ifs/module/yommcc.F90
- sed -i '/COUPLEFESOM2 = /s/.FALSE./.TRUE./g' oifs-43r3/src/ifs/module/yommcc.F90
- sed -i '/COUPLENEMOFOCI = /s/.TRUE./.FALSE./g' oifs-43r3/src/ifs/module/yommcc.F90

170 changes: 144 additions & 26 deletions configs/setups/awicm3/awicm3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ general:
- 'v3.1'
- 'v3.1.1'
- 'v3.1.2'
- 'v3.2'
- 'master'
- 'frontiers-xios'
choose_version:
Expand Down Expand Up @@ -52,6 +53,14 @@ general:
- xios
add_further_reading:
- xios/xios.env.yaml
v3.2:
major_version: v3.2
couplings:
- fesom-2.5+oifs-43r3-awicm-3.1.3+xios-2.5
add_include_models:
- xios
add_further_reading:
- xios/xios.env.yaml
master:
major_version: master
couplings:
Expand Down Expand Up @@ -155,6 +164,25 @@ oifs:
LECURR: true
NAERAD:
NSOLARSPECTRUM: "1"
"v3.2":
with_xios: True
namelist_dir: ${general.esm_namelist_dir}/oifs/${version}/awicm3/v3.2
mip: "cmip6"
wam: true
add_namelist_changes:
fort.4:
NAMCT0:
LXIOS: TRUE
NAMIO_SERV:
NPROC_IO: 2
NPROCESS_LEVEL: 5
NIO_SERV_METHOD: 2
NMSG_LEVEL_CLIENT: 0
NMSG_LEVEL_SERVER: 1
NAEPHY:
LECURR: true
NAERAD:
NSOLARSPECTRUM: "1"

"frontiers-xios":
with_xios: True
Expand Down Expand Up @@ -209,6 +237,13 @@ oifs:
ORBMODE: "fixed_year"
ORBIY: ${start_date!syear}

choose_general.version:
"v3.2":
add_namelist_changes:
fort.4:
NAERAD:
NAERANT_SCALE: "1"

JanStreffing marked this conversation as resolved.
Show resolved Hide resolved

cmip6_data_dir_nml: ${input_dir}/cmip6-data
cmip5_data_dir_nml: ${input_dir}/cmip5-data
Expand Down Expand Up @@ -354,9 +389,6 @@ fesom:
restart_log:
restart_length_unit: "${restart_unit}"
restart_length: "${restart_rate}"
namelist.oce:
oce_tra:
surf_relax_s: "${surf_relax_s}"

choose_general.major_version:
"v3.0":
Expand All @@ -365,18 +397,18 @@ fesom:
namelist.oce:
oce_tra:
surf_relax_s: "${surf_relax_s}"
# Remove ICMCL_INIT forcing, which is only required for standalone simulations (form v3.2 onwards contains seasonal leaf area index, veg albedo etc.)
remove_forcing_files:
- ICMCL_INIT
"v3.1":
namelist_dir: "${esm_namelist_dir}/fesom2/2.0/awicm3/v3.1/"
add_namelist_changes:
namelist.oce:
oce_tra:
surf_relax_s: "${surf_relax_s}"
# Remove ICMCL_INIT forcing, which is only required for standalone simulations (form v3.2 onwards contains seasonal leaf area index, veg albedo etc.)
remove_forcing_files:
- ICMCL_INIT
"v3.2":
namelist_dir: "${esm_namelist_dir}/fesom2/2.0/awicm3/v3.2/"
add_namelist_changes:
namelist.oce:
oce_tra:
surf_relax_s: "${surf_relax_s}"
"master":
namelist_dir: "${model_dir}/config/"
add_namelists:
Expand Down Expand Up @@ -413,10 +445,51 @@ fesom:
namelist.oce:
oce_tra:
surf_relax_s: "${surf_relax_s}"
# Remove ICMCL_INIT forcing, which is only required for standalone simulations (form v3.2 onwards contains seasonal leaf area index, veg albedo etc.)
remove_forcing_files:
- ICMCL_INIT

# Note that this choose block (version) can overwrite settings from the block above (major_version)
choose_general.version:
"v3.2":
namelist_dir: "${esm_namelist_dir}/fesom2/2.5/"
add_namelists:
- namelist.tra
- namelist.cvmix
add_config_sources:
tra: "${namelist_dir}/namelist.tra"
dyn: "${namelist_dir}/namelist.dyn"
add_config_in_work:
tra: "namelist.tra"
dyn: "namelist.dyn"
add_config_files:
tra: tra
dyn: dyn
add_namelist_changes:
namelist.config:
ale_def:
which_ALE: 'zstar'
namelist.oce:
oce_dyn:
SPP: true
k_gm_max: 3000
k_gm_rampmax: 40.0
k_gm_rampmin: 30
scaling_ferreira: true
scaling_fesom14: true

namelist.tra:
tracer_phys:
surf_relax_s: "${surf_relax_s}"
use_momix: false
kv0_const: false
namelist.ice:
ice_therm:
albsn: 0.81
albsnm: 0.77
albi: 0.6
albim: 0.43
JanStreffing marked this conversation as resolved.
Show resolved Hide resolved

# Remove ICMCL_INIT forcing, which is only required for standalone simulations (form v3.2 onwards contains seasonal leaf area index, veg albedo etc.)
remove_forcing_files:
- ICMCL_INIT
remove_namelist_changes.namelist.config.inout: # Not present in the fesom-bounded namelist but in the fesom-2.0.yaml
- restart_length
- restart_length_unit
Expand Down Expand Up @@ -577,15 +650,52 @@ oasis3mct:
- xios
rstos_file_name: 'rstos'
rstas_file_name: 'rstas'
coupling_target_fields:
rstas.nc:
- 'heat_oce:heat_swo <--gauswgt_gss-- A_Qns_oce:A_Qs_all'
- 'prec_oce:snow_oce:evap_oce:subl_oce <--gauswgt_gss-- A_Precip_liquid:A_Precip_solid:A_Evap:A_Subl'
- 'heat_ico <--gauswgt_gss-- A_Q_ice'
- 'taux_oce:tauy_oce:taux_ico:tauy_ico <--bicubic-- A_TauX_oce:A_TauY_oce:A_TauX_ice:A_TauY_ice'
- 'R_Runoff_atm:R_Calving_atm <--gauswgt_gss-- A_Runoff:A_Calving'
- 'hydr_oce:enth_oce <--gauswgt_gss-- R_Runoff_oce:R_Calving_oce'
rstos.nc:
- 'A_SST:A_Ice_frac:A_Snow_thickness:A_Ice_temp:A_Ice_albedo <--gauswgt_i-- sst_feom:sie_feom:snt_feom:ist_feom:sia_feom'
- 'A_CurX:A_CurY <--gauswgt_i-- u_feom:v_feom'
JanStreffing marked this conversation as resolved.
Show resolved Hide resolved
'v3.1':
mct_version: 4.0
input_dir: ${pool_dir}/cy${oifs.version}/${oifs.resolution}-${fesom.resolution}/
rstos_file_name: 'rstos_uv'
rstas_file_name: 'rstas_uv'
add_process_ordering:
- xios
add_coupling_target_fields:
add_rstos.nc:
coupling_target_fields:
rstas.nc:
- 'heat_oce:heat_swo <--gauswgt_gss-- A_Qns_oce:A_Qs_all'
- 'prec_oce:snow_oce:evap_oce:subl_oce <--gauswgt_gss-- A_Precip_liquid:A_Precip_solid:A_Evap:A_Subl'
- 'heat_ico <--gauswgt_gss-- A_Q_ice'
- 'taux_oce:tauy_oce:taux_ico:tauy_ico <--bicubic-- A_TauX_oce:A_TauY_oce:A_TauX_ice:A_TauY_ice'
- 'R_Runoff_atm:R_Calving_atm <--gauswgt_gss-- A_Runoff:A_Calving'
- 'hydr_oce:enth_oce <--gauswgt_gss-- R_Runoff_oce:R_Calving_oce'
rstos.nc:
- 'A_SST:A_Ice_frac:A_Snow_thickness:A_Ice_temp:A_Ice_albedo <--gauswgt_i-- sst_feom:sie_feom:snt_feom:ist_feom:sia_feom'
- 'A_CurX:A_CurY <--gauswgt_i-- u_feom:v_feom'
JanStreffing marked this conversation as resolved.
Show resolved Hide resolved
'v3.2':
mct_version: 4.0
input_dir: ${pool_dir}/cy${oifs.version}/${oifs.resolution}-${fesom.resolution}/
rstos_file_name: 'rstos_uv'
rstas_file_name: 'rstas_uv'
add_process_ordering:
- xios
coupling_target_fields:
rstas.nc:
- 'heat_oce:heat_swo <--gauswgt_c-- A_Qns_oce:A_Qs_all'
- 'prec_oce:snow_oce:evap_oce:subl_oce <--gauswgt_c-- A_Precip_liquid:A_Precip_solid:A_Evap:A_Subl'
- 'heat_ico <--gauswgt_gss-- A_Q_ice'
- 'taux_oce:tauy_oce:taux_ico:tauy_ico <--bicubic-- A_TauX_oce:A_TauY_oce:A_TauX_ice:A_TauY_ice'
- 'R_Runoff_atm:R_Calving_atm <--gauswgt_c-- A_Runoff:A_Calving'
- 'hydr_oce:enth_oce <--gauswgt_c-- R_Runoff_oce:R_Calving_oce'
rstos.nc:
- 'A_SST:A_Ice_frac:A_Snow_thickness:A_Ice_temp:A_Ice_albedo <--gauswgt_i-- sst_feom:sie_feom:snt_feom:ist_feom:sia_feom'
JanStreffing marked this conversation as resolved.
Show resolved Hide resolved
- 'A_CurX:A_CurY <--gauswgt_i-- u_feom:v_feom'
'master':
mct_version: 5.0
Expand All @@ -594,25 +704,33 @@ oasis3mct:
rstas_file_name: 'rstas_uv'
add_process_ordering:
- xios
add_coupling_target_fields:
add_rstos.nc:
coupling_target_fields:
rstas.nc:
- 'heat_oce:heat_swo <--gauswgt_gss-- A_Qns_oce:A_Qs_all'
- 'prec_oce:snow_oce:evap_oce:subl_oce <--gauswgt_gss-- A_Precip_liquid:A_Precip_solid:A_Evap:A_Subl'
- 'heat_ico <--gauswgt_gss-- A_Q_ice'
- 'taux_oce:tauy_oce:taux_ico:tauy_ico <--bicubic-- A_TauX_oce:A_TauY_oce:A_TauX_ice:A_TauY_ice'
- 'R_Runoff_atm:R_Calving_atm <--gauswgt_gss-- A_Runoff:A_Calving'
- 'hydr_oce:enth_oce <--gauswgt_gss-- R_Runoff_oce:R_Calving_oce'
rstos.nc:
- 'A_SST:A_Ice_frac:A_Snow_thickness:A_Ice_temp:A_Ice_albedo <--gauswgt_i-- sst_feom:sie_feom:snt_feom:ist_feom:sia_feom'
JanStreffing marked this conversation as resolved.
Show resolved Hide resolved
- 'A_CurX:A_CurY <--gauswgt_i-- u_feom:v_feom'
'*':
mct_version: 4.0
input_dir: ${pool_dir}/cy${oifs.version}/${oifs.resolution}-${fesom.resolution}/
rstos_file_name: 'rstos'
rstas_file_name: 'rstas'

coupling_target_fields:
rstas.nc:
- 'heat_oce:heat_swo <--gauswgt_gss-- A_Qns_oce:A_Qs_all'
- 'prec_oce:snow_oce:evap_oce:subl_oce <--gauswgt_gss-- A_Precip_liquid:A_Precip_solid:A_Evap:A_Subl'
- 'heat_ico <--gauswgt_gss-- A_Q_ice'
- 'taux_oce:tauy_oce:taux_ico:tauy_ico <--bicubic-- A_TauX_oce:A_TauY_oce:A_TauX_ice:A_TauY_ice'
- 'R_Runoff_atm:R_Calving_atm <--gauswgt_gss-- A_Runoff:A_Calving'
- 'hydr_oce:enth_oce <--gauswgt_gss-- R_Runoff_oce:R_Calving_oce'
rstos.nc:
- 'A_SST:A_Ice_frac:A_Snow_thickness:A_Ice_temp:A_Ice_albedo <--gauswgt_i-- sst_feom:sie_feom:snt_feom:ist_feom:sia_feom'
coupling_target_fields:
rstas.nc:
- 'heat_oce:heat_swo <--gauswgt_gss-- A_Qns_oce:A_Qs_all'
- 'prec_oce:snow_oce:evap_oce:subl_oce <--gauswgt_gss-- A_Precip_liquid:A_Precip_solid:A_Evap:A_Subl'
- 'heat_ico <--gauswgt_gss-- A_Q_ice'
- 'taux_oce:tauy_oce:taux_ico:tauy_ico <--bicubic-- A_TauX_oce:A_TauY_oce:A_TauX_ice:A_TauY_ice'
- 'R_Runoff_atm:R_Calving_atm <--gauswgt_gss-- A_Runoff:A_Calving'
- 'hydr_oce:enth_oce <--gauswgt_gss-- R_Runoff_oce:R_Calving_oce'
rstos.nc:
- 'A_SST:A_Ice_frac:A_Snow_thickness:A_Ice_temp:A_Ice_albedo <--gauswgt_i-- sst_feom:sie_feom:snt_feom:ist_feom:sia_feom'
JanStreffing marked this conversation as resolved.
Show resolved Hide resolved


coupling_directions:
Expand Down
67 changes: 67 additions & 0 deletions namelists/fesom2/2.0/awicm3/v3.2/namelist.config
View file
Open in desktop
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=62 !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='/work/ollie/projects/clidyn/FESOM2/meshes/core2/'
ClimateDataPath='/work/ollie/projects/clidyn/FESOM2/hydrography/phc3.0/'
ResultPath='../result_tmp/'
/

&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='y' ! e.g. y, d, h, s, off
bin_restart_length=1 ! --> do derived type binary restart
bin_restart_length_unit='y' ! 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=.true.
/

&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
/
Loading