Port 50R1 science contribution #59

awnawab · 2025-01-20T20:24:09Z

This PR brings over the 50R1 science contributions pertaining to the wave model.

The following testing has been completed:

Bit-identical norms with all output fields enabled if outblock is reverted to as it is in @cxzk's v8 branch
Bit-identical output to Zak's v8 branch in the IFS e-suite (@cxzk could you please check this again because since you last tested this branch there have been some ostensibly bit-identical contributions)

@jrbidlot and @jkousal32 could you please review this PR too? Please pay particular focus to the scripts changes, as unlike the source these are not patches directly generated from IFS commits.

The only thing missing in this PR are updates to the validation norms for the finer grids. I will add these as the final step before merging once the PR has been approved.

…DICE

…te_wam_bathymetry_swldissip: 1) boost obstruction for high res to compensate for lack on resolution in subgrid data, 2) activate new swell dissip term to 50%

…XCEPT sbottom [sdice scales all previous source terms by ice cover beta]

…oved from SDICE to IMPLSCH and given switch LCISCAL

…ice: scattering, bottom friction & viscous friction

…y on)

… which was probably much thicker than the values CITHICK is giving

…pletely handled within SDICE1

…in implsch and are reset at restarts...

…rue, but also in MICEP)

…tional remove NEMOSST from coupler Ensure ibrmem is initialised. declare NFIELD higher debug debug debug: remove hard coded adjustment to NEMOSST debug: use NEMOCICOVER to deallocate NEMO2WAM

FussyDuck · 2025-01-20T20:24:17Z

All committers have signed the CLA.

jrbidlot · 2025-01-22T17:50:26Z

Hi Ahmad,
as far as I can tell it looks OK.
Note that there will be another minor contribution from the final 49R2, currently in the v8b branch but not yet in 50R1 (as far as I can tell)

awnawab · 2025-01-23T08:27:49Z

Thanks for the feedback Jean! develop-1.4 will now be used to collect changes to 49R2. So changes just for 49R2 can go just there, if we decide to include it in 50R1 then we would simply cherry-pick those commits onto develop.

awnawab · 2025-01-29T10:26:08Z

@cxzk were you able to run this branch through the CI again to confirm that it is bitid? @jkousal32 could you also please take a look at this PR?

cxzk · 2025-01-29T10:29:13Z

@cxzk were you able to run this branch through the CI again to confirm that it is bitid? @jkousal32 could you also please take a look at this PR?

Trying to do that now, but I need to re-establish a clean reference first.

jkousal32

All looks great to me, thanks for that!!

cxzk

Yes, this appears to be bit-identical to my temporary 50r1 v8 + IFS-3792 branch, when run in standard IFS experiment configurations, so good to merge from my point of view and I can then switch to using this for the later stages of preparing CY50R1.

Thanks!

awnawab · 2025-01-31T14:33:15Z

Thanks all for the reviews and feedback 🙏 @wdeconinck I have now updated the validation norms for the finer grids, so please merge this once the CI is green again. Could you also please tag this as 1.5.0?

jkousal32 added 30 commits January 20, 2025 20:06

add dissipation by sea ice as implemented by Lotfi

e92e516

add sdice into CMakeLists.txt

0e6b6dc

fix compile errors

cb428b8

fix compile errors

73ab9fd

fix compile errors

dd423e9

comment out CIREDUC, turning off all sea ice attenuation except for S…

ad8f13b

…DICE

fix how I ignore CIREDUC

f09b633

Pull in new changes from pajk_CY48R1_for_49R1_v2_hindcast_revise_crea…

fbb4c2a

…te_wam_bathymetry_swldissip: 1) boost obstruction for high res to compensate for lack on resolution in subgrid data, 2) activate new swell dissip term to 50%

Shift from deep-water only case for sdice.F90 to generalised

6399d1d

fix formatting of commented out lines

4a03e75

1) fix vars passed into sdice; 2) call sdice after all source terms E…

26febd6

…XCEPT sbottom [sdice scales all previous source terms by ice cover beta]

fix compile error

d33783c

allow waves to propagate up to 100% ice cover

6a30bec

separate scaling of all source terms based on sea ice concentration m…

cb6b98b

…oved from SDICE to IMPLSCH and given switch LCISCAL

fix compile error

a9b72b5

Introducing separate switches for 3 types of attenuation of waves in …

6cde846

…ice: scattering, bottom friction & viscous friction

Introducing separate switches for 3 types of attenuation of waves in …

01cc580

…ice: scattering, bottom friction & viscous friction

switch viscous attenuation on (LCIWA3)

6faaaad

fix compilation errors

60012a6

fix compilation errors

6816368

include some print statements for the userin log

12fe1b1

move print statements into userin

c19f314

only call ice source terms when we have ice info

0b0c055

adjust print outs according to when terms are actually active

271c537

set default logical switches to revert to operational (scattering onl…

4964331

…y on)

use CITHICK instead of my self defined constant CITH=1.2 m for Davis,…

76c191b

… which was probably much thicker than the values CITHICK is giving

reduction factor for attenuation due to scattering, CIREDUCE, now com…

27e96f5

…pletely handled within SDICE1

first commit of simple ice break model; ice break fields initialised …

2b66021

…in implsch and are reset at restarts...

default LCIWACPL1 = FALSE

b0d2b51

fix compile errors

bd77124

jrbidlot and others added 18 commits January 20, 2025 20:11

debug

36b370c

clean-up

2d4ffaf

correction

7a3b4a7

fix git rebase issues

4dc037c

fix git rebase issues (amend)

c19170f

Define HICMIN in YOWICE (HICMIN is not used exclusively when LCIWA1=t…

61514db

…rue, but also in MICEP)

address step 0 related bugs

319cf01

Clean up NEMO2WAM coupling: 1) remove SST; 2) make fetch of IBRMEM op…

8028c1e

…tional remove NEMOSST from coupler Ensure ibrmem is initialised. declare NFIELD higher debug debug debug: remove hard coded adjustment to NEMOSST debug: use NEMOCICOVER to deallocate NEMO2WAM

reorder parameters in mpcrtbl (due to deleting nemosst)

872804e

modify JPPFLAG to account for deleting nemosst

2e830b3

bugfix for output of newly introduced parameters in 49R1

da17854

IFS-50R1-SYNC: rebase cleanup

b4b400c

IFS-SOURCE-50R1-SYNC: make more namelist entries configurable

17bb319

CY50R1: add O48 unit-test

612b086

Update GPU offload support in README

aba7287

IFS-SOURCE-50R1-SYNC: update validation hashes for O48 grids

ee0fa9c

IFS-SOURCE-50R1-SYNC: rebase cleanup

69fd410

RUNWAM: initialise LLWAVEINIT_ONLY to FALSE

1aa9a6f

awnawab requested a review from wdeconinck January 20, 2025 20:24

awnawab requested a review from cxzk January 20, 2025 20:24

jkousal32 approved these changes Jan 29, 2025

View reviewed changes

cxzk approved these changes Jan 30, 2025

View reviewed changes

wdeconinck approved these changes Jan 31, 2025

View reviewed changes

IFS-50R1-SYNC: update validation hashes for finer grids

f9a64ab

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port 50R1 science contribution #59

Port 50R1 science contribution #59

awnawab commented Jan 20, 2025

FussyDuck commented Jan 20, 2025 •

edited

Loading

jrbidlot commented Jan 22, 2025

awnawab commented Jan 23, 2025

awnawab commented Jan 29, 2025

cxzk commented Jan 29, 2025

jkousal32 left a comment

cxzk left a comment

awnawab commented Jan 31, 2025

Port 50R1 science contribution #59

Are you sure you want to change the base?

Port 50R1 science contribution #59

Conversation

awnawab commented Jan 20, 2025

FussyDuck commented Jan 20, 2025 • edited Loading

jrbidlot commented Jan 22, 2025

awnawab commented Jan 23, 2025

awnawab commented Jan 29, 2025

cxzk commented Jan 29, 2025

jkousal32 left a comment

Choose a reason for hiding this comment

cxzk left a comment

Choose a reason for hiding this comment

awnawab commented Jan 31, 2025

FussyDuck commented Jan 20, 2025 •

edited

Loading