Code

Port 50R1 science contribution#59

Code

Open

awnawab wants to merge 120 commits intoecmwf-ifs:developecmwf-ifs/ecwam:developfrom awnawab:naan-port-50r1-scienceawnawab/ecwam:naan-port-50r1-scienceCopy head branch name to clipboard

+1,730-640

Commits

Commits on Jan 20, 2025

• add dissipation by sea ice as implemented by Lotfi

  

  jkousal32

  authored and

  awnawab

  committed
  e92e516

  Copy full SHA for e92e516

• add sdice into CMakeLists.txt

  

  jkousal32

  authored and

  awnawab

  committed
  0e6b6dc

  Copy full SHA for 0e6b6dc

• fix compile errors

  

  jkousal32

  authored and

  awnawab

  committed
  cb428b8

  Copy full SHA for cb428b8

• fix compile errors

  

  jkousal32

  authored and

  awnawab

  committed
  73ab9fd

  Copy full SHA for 73ab9fd

• fix compile errors

  

  jkousal32

  authored and

  awnawab

  committed
  dd423e9

  Copy full SHA for dd423e9

• comment out CIREDUC, turning off all sea ice attenuation except for SDICE

  

  jkousal32

  authored and

  awnawab

  committed
  ad8f13b

  Copy full SHA for ad8f13b

• fix how I ignore CIREDUC

  

  jkousal32

  authored and

  awnawab

  committed
  f09b633

  Copy full SHA for f09b633

• Pull in new changes from pajk_CY48R1_for_49R1_v2_hindcast_revise_create_wam_bathymetry_swldissip: 1) boost obstruction for high res to compensate for lack on resolution in subgrid data, 2) activate…

  Show description for fbb4c2a
  

  jkousal32

  authored and

  awnawab

  committed
  fbb4c2a

  Copy full SHA for fbb4c2a

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

  

  jkousal32

  authored and

  awnawab

  committed
  6399d1d

  Copy full SHA for 6399d1d

• fix formatting of commented out lines

  

  jkousal32

  authored and

  awnawab

  committed
  4a03e75

  Copy full SHA for 4a03e75

• 1) fix vars passed into sdice; 2) call sdice after all source terms EXCEPT sbottom [sdice scales all previous source terms by ice cover beta]

  

  jkousal32

  authored and

  awnawab

  committed
  26febd6

  Copy full SHA for 26febd6

• fix compile error

  

  jkousal32

  authored and

  awnawab

  committed
  d33783c

  Copy full SHA for d33783c

• allow waves to propagate up to 100% ice cover

  

  jkousal32

  authored and

  awnawab

  committed
  6a30bec

  Copy full SHA for 6a30bec

• separate scaling of all source terms based on sea ice concentration moved from SDICE to IMPLSCH and given switch LCISCAL

  

  jkousal32

  authored and

  awnawab

  committed
  cb6b98b

  Copy full SHA for cb6b98b

• fix compile error

  

  jkousal32

  authored and

  awnawab

  committed
  a9b72b5

  Copy full SHA for a9b72b5

• Introducing separate switches for 3 types of attenuation of waves in ice: scattering, bottom friction & viscous friction

  

  jkousal32

  authored and

  awnawab

  committed
  6cde846

  Copy full SHA for 6cde846

• Introducing separate switches for 3 types of attenuation of waves in ice: scattering, bottom friction & viscous friction

  

  jkousal32

  authored and

  awnawab

  committed
  01cc580

  Copy full SHA for 01cc580

• switch viscous attenuation on (LCIWA3)

  

  jkousal32

  authored and

  awnawab

  committed
  6faaaad

  Copy full SHA for 6faaaad

• fix compilation errors

  

  jkousal32

  authored and

  awnawab

  committed
  60012a6

  Copy full SHA for 60012a6

• fix compilation errors

  

  jkousal32

  authored and

  awnawab

  committed
  6816368

  Copy full SHA for 6816368

• include some print statements for the userin log

  

  jkousal32

  authored and

  awnawab

  committed
  12fe1b1

  Copy full SHA for 12fe1b1

• move print statements into userin

  

  jkousal32

  authored and

  awnawab

  committed
  c19f314

  Copy full SHA for c19f314

• only call ice source terms when we have ice info

  

  jkousal32

  authored and

  awnawab

  committed
  0b0c055

  Copy full SHA for 0b0c055

• adjust print outs according to when terms are actually active

  

  jkousal32

  authored and

  awnawab

  committed
  271c537

  Copy full SHA for 271c537

• set default logical switches to revert to operational (scattering only on)

  

  jkousal32

  authored and

  awnawab

  committed
  4964331

  Copy full SHA for 4964331

• use CITHICK instead of my self defined constant CITH=1.2 m for Davis, which was probably much thicker than the values CITHICK is giving

  

  jkousal32

  authored and

  awnawab

  committed
  76c191b

  Copy full SHA for 76c191b

• reduction factor for attenuation due to scattering, CIREDUCE, now completely handled within SDICE1

  

  jkousal32

  authored and

  awnawab

  committed
  27e96f5

  Copy full SHA for 27e96f5

• first commit of simple ice break model; ice break fields initialised in implsch and are reset at restarts...

  

  jkousal32

  authored and

  awnawab

  committed
  2b66021

  Copy full SHA for 2b66021

• default LCIWACPL1 = FALSE

  

  jkousal32

  authored and

  awnawab

  committed
  b0d2b51

  Copy full SHA for b0d2b51

• fix compile errors

  

  jkousal32

  authored and

  awnawab

  committed
  bd77124

  Copy full SHA for bd77124

• Change name of IBR_MEM to IBRMEM

  

  jkousal32

  authored and

  awnawab

  committed
  2d5f0fe

  Copy full SHA for 2d5f0fe

• add IBRMEM as output; intialise IBRMEM in INITMDL

  

  jkousal32

  authored and

  awnawab

  committed
  373348d

  Copy full SHA for 373348d

• fix compile error

  

  jkousal32

  authored and

  awnawab

  committed
  60d8d2e

  Copy full SHA for 60d8d2e

• initialise properly

  

  jkousal32

  authored and

  awnawab

  committed
  c85d9ac

  Copy full SHA for c85d9ac

• set IBR_CONST5=1.

  

  jkousal32

  authored and

  awnawab

  committed
  f73b9f8

  Copy full SHA for f73b9f8

• change orientation of wave sea ice mask

  

  jkousal32

  authored and

  awnawab

  committed
  6a17ad1

  Copy full SHA for 6a17ad1

• use strong ice upper bound

  

  jkousal32

  authored and

  awnawab

  committed
  ef3dc8d

  Copy full SHA for ef3dc8d

• adjust parameterisation of sea ice thickness - boost

  

  jkousal32

  authored and

  awnawab

  committed
  a85fab5

  Copy full SHA for a85fab5

• New value system for IBRMEM and IBRMEMOUT: 2=SOLID,1=BROKEN,0=MISSING; Corrected logic for use of IBRMEM in ICEBREAK

  

  jkousal32

  authored and

  awnawab

  committed
  7a27a96

  Copy full SHA for 7a27a96

• add ibrmemout.F90

  

  jkousal32

  authored and

  awnawab

  committed
  af23854

  Copy full SHA for af23854

• convert IBRMEMMSK to REAL

  

  jkousal32

  authored and

  awnawab

  committed
  9701beb

  Copy full SHA for 9701beb

• update ibrmemout.F90 info

  

  jkousal32

  authored and

  awnawab

  committed
  c67bcd1

  Copy full SHA for c67bcd1

• correct syntax

  

  jkousal32

  authored and

  awnawab

  committed
  d9bbff7

  Copy full SHA for d9bbff7

• sea ice scaling must go BEFORE any SDICE terms

  

  jkousal32

  authored and

  awnawab

  committed
  1ad12b6

  Copy full SHA for 1ad12b6

• correct formulation of LAMBDASQ; revert back to default ice thickness scaling

  

  jkousal32

  authored and

  awnawab

  committed
  a788c60

  Copy full SHA for a788c60

• introduce ALPFACX with default value set to 1 (i.e. no scaling)

  

  jkousal32

  authored and

  awnawab

  committed
  134eb19

  Copy full SHA for 134eb19

• setting up LCIWACPL2 coupling

  

  jkousal32

  authored and

  awnawab

  committed
  6d4d4c1

  Copy full SHA for 6d4d4c1

• fixed compile changes

  

  jkousal32

  authored and

  awnawab

  committed
  46c8365

  Copy full SHA for 46c8365

• fix compile issues

  

  jkousal32

  authored and

  awnawab

  committed
  9c66d4f

  Copy full SHA for 9c66d4f

• replace LCIWACPL2 with LWNEMOCOUWRS

  

  jkousal32

  authored and

  awnawab

  committed
  a317923

  Copy full SHA for a317923

• implement coupling through wave radiative stress and also pass wave number

  

  jkousal32

  authored and

  awnawab

  committed
  95581aa

  Copy full SHA for 95581aa

• pass ibrmem back to ecwam

  

  jkousal32

  authored and

  awnawab

  committed
  4d6f3f3

  Copy full SHA for 4d6f3f3

• replace LCIWACPL1 with LWNEMOCOUIBR

  

  jkousal32

  authored and

  awnawab

  committed
  7e57a8f

  Copy full SHA for 7e57a8f

• add icebreak_modify_attenuation to CMakeLists

  

  jkousal32

  authored and

  awnawab

  committed
  e174984

  Copy full SHA for e174984

• no need to initialize IBRMEM as solid in the wave model (already done in the ice model)

  

  jkousal32

  authored and

  awnawab

  committed
  5398dd5

  Copy full SHA for 5398dd5

• amend spectral density minimum enforcement

  

  jkousal32

  authored and

  awnawab

  committed
  fd360c3

  Copy full SHA for fd360c3

• merge SDICE* into SDICE, and take IF statements out of loops

  

  jkousal32

  authored and

  awnawab

  committed
  b8d2500

  Copy full SHA for b8d2500

• fix compile error

  

  jkousal32

  authored and

  awnawab

  committed
  b7df29a

  Copy full SHA for b7df29a

• fix compile error

  

  jkousal32

  authored and

  awnawab

  committed
  0819bac

  Copy full SHA for 0819bac

• fix compile errors

  

  jkousal32

  authored and

  awnawab

  committed
  1917b8d

  Copy full SHA for 1917b8d

• implement implicit correction factor for fluxes

  

  jkousal32

  authored and

  awnawab

  committed
  1a8df6f

  Copy full SHA for 1a8df6f

• fix compile errors

  

  jkousal32

  authored and

  awnawab

  committed
  5d11aaf

  Copy full SHA for 5d11aaf

• implicit factor correction not needed in wdfluxes

  

  jkousal32

  authored and

  awnawab

  committed
  8db9cf2

  Copy full SHA for 8db9cf2

• change range of ibrmem to 0<ibrmem<1; avoid if statements in loops

  

  jkousal32

  authored and

  awnawab

  committed
  81ccefc

  Copy full SHA for 81ccefc

• follow fortran convention for mixing real and integer numbers

  

  jkousal32

  authored and

  awnawab

  committed
  7340b77

  Copy full SHA for 7340b77

• don't call ICEBREAK_MODIFY_ATTENUATION at step 0

  

  jkousal32

  authored and

  awnawab

  committed
  be46317

  Copy full SHA for be46317

• IBRMEM is probably not defined for all wave model points

  

  jkousal32

  authored and

  awnawab

  committed
  34e6d5d

  Copy full SHA for 34e6d5d

• engage all routines

  

  jkousal32

  authored and

  awnawab

  committed
  c7c771b

  Copy full SHA for c7c771b

• amend spectral density minimum enforcement step 0

  

  jkousal32

  authored and

  awnawab

  committed
  a40b213

  Copy full SHA for a40b213

• Don't introduce any noise to spectrum if we have ANY sea ice

  

  jkousal32

  authored and

  awnawab

  committed
  7265b38

  Copy full SHA for 7265b38

• use LWNEMOCOUWRS more wisely to ensure no extra cost when not coupling this field

  

  jkousal32

  authored and

  awnawab

  committed
  8cb53dc

  Copy full SHA for 8cb53dc

• remove piping for wnum from ecwam to NEMO

  

  jkousal32

  authored and

  awnawab

  committed
  615fd80

  Copy full SHA for 615fd80

• future proofing my code for when LWNEMOCOUWRS is off

  

  jkousal32

  authored and

  awnawab

  committed
  cea1ee8

  Copy full SHA for cea1ee8

• INITIALISE IBRMEM AS SOLID IF NOT COUPLED

  

  jkousal32

  authored and

  awnawab

  committed
  1cd924a

  Copy full SHA for 1cd924a

• fix compile error

  

  jkousal32

  authored and

  awnawab

  committed
  a86fae5

  Copy full SHA for a86fae5

• suspect W_MAXH breaking due to WAVNUM not defined in ice at step zero

  

  jkousal32

  authored and

  awnawab

  committed
  7367b31

  Copy full SHA for 7367b31

• INITIALISE IBRMEM AS SOLID ALWAYS

  

  jkousal32

  authored and

  awnawab

  committed
  a271e63

  Copy full SHA for a271e63

• add some clarifying comments

  

  jkousal32

  authored and

  awnawab

  committed
  a7ac9d6

  Copy full SHA for a7ac9d6

• drop floor on spectral output / reset: PPMIN_RESET

  

  jkousal32

  authored and

  awnawab

  committed
  462910b

  Copy full SHA for 462910b

• don't use spectral floor for output to grib

  

  jkousal32

  authored and

  awnawab

  committed
  2d04899

  Copy full SHA for 2d04899

• revert changes for PPMIN_RESET for grib spectral output

  

  jkousal32

  authored and

  awnawab

  committed
  da4ed56

  Copy full SHA for da4ed56

• still allow noise in full sea ice cover, but only ten percent

  

  jkousal32

  authored and

  awnawab

  committed
  a0fe21a

  Copy full SHA for a0fe21a

• tidy CIFLAG relics

  

  jkousal32

  authored and

  awnawab

  committed
  11af20a

  Copy full SHA for 11af20a

• problem with permanent ice sheet (waves where ice sheet is) no longer relevant, and this solution was masking where we don't want it to (depths<250m in antarctica)

  

  jkousal32

  authored and

  awnawab

  committed
  5246243

  Copy full SHA for 5246243

• tidy 1: general cleanup

  

  jkousal32

  authored and

  awnawab

  committed
  373ae79

  Copy full SHA for 373ae79

• tidy 2: consistency for variable naming

  

  jkousal32

  authored and

  awnawab

  committed
  f9eee38

  Copy full SHA for f9eee38

• use cases for different options in SDICE3

  

  jkousal32

  authored and

  awnawab

  committed
  158d692

  Copy full SHA for 158d692

• forgot to delete END IF when changing to "case" method

  

  jkousal32

  authored and

  awnawab

  committed
  cc7ae62

  Copy full SHA for cc7ae62

• tidy 1: general cleanup (continued)

  

  jkousal32

  authored and

  awnawab

  committed
  c7206cd

  Copy full SHA for c7206cd

• tidy 3: consistency for recent GPU optimization

  

  jkousal32

  authored and

  awnawab

  committed
  4d55e94

  Copy full SHA for 4d55e94

• tested that the issues for W_MAXH (due to how waves in ice are defined) and IBRMEM (due to initialization) are indeed solved now

  

  jkousal32

  authored and

  awnawab

  committed
  0d3470f

  Copy full SHA for 0d3470f

• correct description of LCISCAL

  

  jkousal32

  authored and

  awnawab

  committed
  7545b5a

  Copy full SHA for 7545b5a

• modularization of attenuation due to sea ice (sdice1 replaces CIWAF; sdice2 replaces CIWABR; effect of CIREDUCE considered as per regular source term integration [i.e. within IMPLSCH])

  

  jkousal32

  authored and

  awnawab

  committed
  352a92a

  Copy full SHA for 352a92a

• tidy (tiny)

  

  jkousal32

  authored and

  awnawab

  committed
  5ff4ef0

  Copy full SHA for 5ff4ef0

• move writing of step 0 to initmdl

  

  jrbidlot

  authored and

  awnawab

  committed
  bb12c33

  Copy full SHA for bb12c33

• add WAM2NEMO

  

  jrbidlot

  authored and

  awnawab

  committed
  6b89261

  Copy full SHA for 6b89261

• add INTFLDS

  

  jrbidlot

  authored and

  awnawab

  committed
  ed1c97c

  Copy full SHA for ed1c97c

• call wwavemdl for nstep=0 for initialisation only

  

  jrbidlot

  authored and

  awnawab

  committed
  bff1f4a

  Copy full SHA for bff1f4a

• fix LWCOUNORMS functionality

  

  jrbidlot

  authored and

  awnawab

  committed
  f45d19d

  Copy full SHA for f45d19d

• test resetting date of the last wind read

  

  jrbidlot

  authored and

  awnawab

  committed
  2d4379c

  Copy full SHA for 2d4379c

• debug

  

  jrbidlot

  authored and

  awnawab

  committed
  577c267

  Copy full SHA for 577c267

• debug

  

  jrbidlot

  authored and

  awnawab

  committed
  36b370c

  Copy full SHA for 36b370c

• clean-up

  

  jrbidlot

  authored and

  awnawab

  committed
  2d4ffaf

  Copy full SHA for 2d4ffaf

• correction

  

  jrbidlot

  authored and

  awnawab

  committed
  7a3b4a7

  Copy full SHA for 7a3b4a7

• fix git rebase issues

  

  jkousal32

  authored and

  awnawab

  committed
  4dc037c

  Copy full SHA for 4dc037c

• fix git rebase issues (amend)

  

  jkousal32

  authored and

  awnawab

  committed
  c19170f

  Copy full SHA for c19170f

• Define HICMIN in YOWICE (HICMIN is not used exclusively when LCIWA1=true, but also in MICEP)

  

  jkousal32

  authored and

  awnawab

  committed
  61514db

  Copy full SHA for 61514db

• address step 0 related bugs

  

  jkousal32

  authored and

  awnawab

  committed
  319cf01

  Copy full SHA for 319cf01

• Clean up NEMO2WAM coupling: 1) remove SST; 2) make fetch of IBRMEM optional

  Show description for 8028c1e
  

  jkousal32

  authored and

  awnawab

  committed
  8028c1e

  Copy full SHA for 8028c1e

• reorder parameters in mpcrtbl (due to deleting nemosst)

  

  jkousal32

  authored and

  awnawab

  committed
  872804e

  Copy full SHA for 872804e

• modify JPPFLAG to account for deleting nemosst

  

  jkousal32

  authored and

  awnawab

  committed
  2e830b3

  Copy full SHA for 2e830b3

• bugfix for output of newly introduced parameters in 49R1

  

  jrbidlot

  authored and

  awnawab

  committed
  da17854

  Copy full SHA for da17854

• IFS-50R1-SYNC: rebase cleanup

  awnawab

  committed
  b4b400c

  Copy full SHA for b4b400c

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

  awnawab

  committed
  17bb319

  Copy full SHA for 17bb319

• CY50R1: add O48 unit-test

  awnawab

  committed
  612b086

  Copy full SHA for 612b086

• Update GPU offload support in README

  awnawab

  committed
  aba7287

  Copy full SHA for aba7287

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

  awnawab

  committed
  ee0fa9c

  Copy full SHA for ee0fa9c

• IFS-SOURCE-50R1-SYNC: rebase cleanup

  awnawab

  committed
  69fd410

  Copy full SHA for 69fd410

• RUNWAM: initialise LLWAVEINIT_ONLY to FALSE

  awnawab

  committed
  1aa9a6f

  Copy full SHA for 1aa9a6f

Commits on Jan 31, 2025

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

  awnawab

  committed
  f9a64ab

  Copy full SHA for f9a64ab