Code

Separate GIS and AIS coupling modes#136

Code

Open

matthewhoffman wants to merge 133 commits intoMALI-Dev:masterMALI-Dev/E3SM:masterfrom E3SM-Project:matthewhoffman/mali/separate-gis-ais-modesE3SM-Project/E3SM:matthewhoffman/mali/separate-gis-ais-modesCopy head branch name to clipboard

+1,643-310

Commits

Commits on Apr 10, 2024

• Do not update FCT masks between RK stages

  Show description for 3aa29f5
  trhille

  committed
  3aa29f5

  Copy full SHA for 3aa29f5

Commits on Apr 23, 2024

• Add an empty template for the new routine

  hollyhan

  committed
  e3b257c

  Copy full SHA for e3b257c

• Call the new routine from a higher level driver

  hollyhan

  committed
  293c6e3

  Copy full SHA for 293c6e3

• Edit Makefile

  hollyhan

  committed
  ee116ae

  Copy full SHA for ee116ae

• Add a config option to enable/disable the scheme

  hollyhan

  committed
  719ff48

  Copy full SHA for 719ff48

• pseudocode

  hollyhan

  committed
  dcc06bc

  Copy full SHA for dcc06bc

• Add mask variables to Registry

  hollyhan

  committed
  d21f927

  Copy full SHA for d21f927

• Define mask variables

  hollyhan

  committed
  1d0d9e0

  Copy full SHA for 1d0d9e0

• Create initial masks in the module

  hollyhan

  committed
  8664942

  Copy full SHA for 8664942

• Add horizontal and vertical extrap algorithms

  hollyhan

  committed
  8ba47c5

  Copy full SHA for 8ba47c5

• fix the error in the 2D seed/grow mask floodfill

  hollyhan

  committed
  9c33828

  Copy full SHA for 9c33828

• fix the dimension for the mask variables

  hollyhan

  committed
  ae4f916

  Copy full SHA for ae4f916

• add variables in Registry for benchmarking the 2D seed and grow masks

  hollyhan

  committed
  57b6ce1

  Copy full SHA for 57b6ce1

• change the definition of the 2D growOceanMaskHoriz

  Show description for d9968f5
  hollyhan

  committed
  d9968f5

  Copy full SHA for d9968f5

• Perform layer-by-layer horizontal extrapolation of 3D validOceanMask

  hollyhan

  committed
  06eb01a

  Copy full SHA for 06eb01a

• add back 'ismip6shelfMelt_zBndsOcean'

  hollyhan

  committed
  581bc32

  Copy full SHA for 581bc32

• Temp: use TFoceanOld and TFoceanNew test variables for extrapolation

  Show description for 8a7d658
  hollyhan

  committed
  8a7d658

  Copy full SHA for 8a7d658

• fix typo in ismip6shelfMelt_zBndsOcean

  hollyhan

  committed
  b2d8795

  Copy full SHA for b2d8795

• update validOceanMask within the horizontal extrapolation loop

  hollyhan

  committed
  be500b7

  Copy full SHA for be500b7

• fix a typo in comment

  hollyhan

  committed
  4991f5c

  Copy full SHA for 4991f5c

• Create a seperate routine for horizontal extrapolation

  hollyhan

  committed
  41d9c47

  Copy full SHA for 41d9c47

• Create a seperate routine for vertical extrapolation

  hollyhan

  committed
  7da222b

  Copy full SHA for 7da222b

• Switch between horizontal and vertical extrapolation

  Show description for cc64fbc
  hollyhan

  committed
  cc64fbc

  Copy full SHA for cc64fbc

• Add correction for pressure melting point change

  Show description for b77eb3f
  hollyhan

  committed
  b77eb3f

  Copy full SHA for b77eb3f

• Add smoothing to horizontally extrapolated field

  hollyhan

  committed
  5c4b071

  Copy full SHA for 5c4b071

• Edit the horizontal smoothing algorithm

  Show description for 036ce78
  hollyhan

  committed
  036ce78

  Copy full SHA for 036ce78

• Add a timer for the horizontal and vertical schemes

  hollyhan

  committed
  48b0530

  Copy full SHA for 48b0530

• Identify invalid ocean data locations

  hollyhan

  committed
  ba9e59c

  Copy full SHA for ba9e59c

Commits on Apr 25, 2024

• Activate the ismip6ShelfMelt package

  Show description for 889ba33
  hollyhan

  committed
  889ba33

  Copy full SHA for 889ba33

Commits on Apr 30, 2024

• Check for invalid TF value in TFdraft calculation

  Show description for 22b63d9
  hollyhan

  committed
  22b63d9

  Copy full SHA for 22b63d9

Commits on May 10, 2024

• Activate extrapOceanData package when TF extrap scheme is on

  Show description for 00d936b
  hollyhan

  committed
  00d936b

  Copy full SHA for 00d936b

Commits on May 30, 2024

• Treat phi slopes same as GL at land margins

  Show description for f0f94bb
  alexolinhager

  committed
  f0f94bb

  Copy full SHA for f0f94bb

• No waterPress. or hydroPot. where no grounded ice

  Show description for 9955a29
  alexolinhager

  committed
  9955a29

  Copy full SHA for 9955a29

• Debug no waterPressure where no grounded ice

  alexolinhager

  committed
  4c35981

  Copy full SHA for 4c35981

• rearrange margin hydropotential modifications

  Show description for f71517d
  alexolinhager

  committed
  f71517d

  Copy full SHA for f71517d

• Remove one-sided hydropotential slope at GL

  Show description for 6883298
  alexolinhager

  committed
  6883298

  Copy full SHA for 6883298

• Fix hydropotentialBase=0 in ocean bug

  Show description for ff4cc84
  alexolinhager

  committed
  ff4cc84

  Copy full SHA for ff4cc84

• remove redundant waterPressure GL alteration

  Show description for 41a27df
  alexolinhager

  committed
  41a27df

  Copy full SHA for 41a27df

• Reinstate limit on inflow at ice margins

  Show description for d7c59ed
  alexolinhager

  committed
  d7c59ed

  Copy full SHA for d7c59ed

• impose 1 Pa outflowing phi at GL

  Show description for e4e35cf
  alexolinhager

  committed
  e4e35cf

  Copy full SHA for e4e35cf

• Replace 1 Pa outflow with MIN_PHISLOPE_GL

  Show description for 3fbff1a
  alexolinhager

  committed
  3fbff1a

  Copy full SHA for 3fbff1a

• Remove low waterFlux condition on channels

  Show description for 63dc2be
  alexolinhager

  committed
  63dc2be

  Copy full SHA for 63dc2be

• Address Minor Comments

  Show description for 0d4e3cd
  alexolinhager

  committed
  0d4e3cd

  Copy full SHA for 0d4e3cd

• Reinsert deleted line

  Show description for 0dce9f7
  alexolinhager

  committed
  0dce9f7

  Copy full SHA for 0dce9f7

• Reinsert Line

  Show description for 049962d
  alexolinhager

  committed
  049962d

  Copy full SHA for 049962d

Commits on Jun 13, 2024

• Change undefined value to zero

  Show description for 7b4d67c
  alexolinhager

  committed
  7b4d67c

  Copy full SHA for 7b4d67c

Commits on Jun 26, 2024

• Redefine phi and Pw where no ice

  Show description for 9267895
  alexolinhager

  committed
  9267895

  Copy full SHA for 9267895

• Revert "remove redundant waterPressure GL alteration"

  Show description for 2881a93
  alexolinhager

  committed
  2881a93

  Copy full SHA for 2881a93

Commits on Jun 27, 2024

• No channelDischarge where no water upstream

  Show description for 97f3c40
  alexolinhager

  committed
  97f3c40

  Copy full SHA for 97f3c40

• initialize hydopotential correctly where no ice

  alexolinhager

  committed
  f027409

  Copy full SHA for f027409

Commits on Jun 28, 2024

• Debug min. limit on waterPressure

  Show description for cea4a1f
  alexolinhager

  committed
  cea4a1f

  Copy full SHA for cea4a1f

Commits on Jul 23, 2024

• Reassign extrapolated TF back to primary TF field

  Show description for 47fd8f8
  matthewhoffman

  committed
  47fd8f8

  Copy full SHA for 47fd8f8

Commits on Aug 15, 2024

• Clean up after code review

  Show description for c0f079e
  trhille

  committed
  c0f079e

  Copy full SHA for c0f079e

• Apply suggestions from code review

  Show description for f984146
  

  alexolinhager

  and

  matthewhoffman

  authored
  f984146

  Copy full SHA for f984146

Commits on Aug 19, 2024

• Merge branch 'matthewhoffman/mali/e3sm-update-to-mali-dev-20240819' into MALI-Dev/develop

  Show description for e5db463
  matthewhoffman

  committed
  e5db463

  Copy full SHA for e5db463

• Add catch-all elsewhere clause to waterPressure alteration

  Show description for b790179
  alexolinhager

  committed
  b790179

  Copy full SHA for b790179

• Time average effectivePressure over subcycle

  Show description for d647f60
  alexolinhager

  committed
  d647f60

  Copy full SHA for d647f60

Commits on Aug 20, 2024

• Merge branch 'MALI-Dev/alexolinhager/iceMarginBCalterations' into MALI-Dev/develop

  Show description for 9bc55d4
  matthewhoffman

  committed
  9bc55d4

  Copy full SHA for 9bc55d4

• Merge branch 'trhille/mali/remove_extra_fct_mask_updates' into MALI-Dev/develop

  Show description for 06eec9c
  matthewhoffman

  committed
  06eec9c

  Copy full SHA for 06eec9c

• Do not update cell, edge, or vertex masks during RK loop

  Show description for a975404
  trhille

  committed
  a975404

  Copy full SHA for a975404

• Remove cellMask from vertical_remap

  Show description for f135bdf
  trhille

  committed
  f135bdf

  Copy full SHA for f135bdf

• Update masks before RK loop, but not at start of each advection stage.

  Show description for f6a6653
  trhille

  committed
  f6a6653

  Copy full SHA for f6a6653

Commits on Aug 26, 2024

• Merge branch 'trhille/mali/remove_mask_updates_in_RK_loop' into MALI-Dev/develop

  Show description for 82a7afe
  matthewhoffman

  committed
  82a7afe

  Copy full SHA for 82a7afe

• Apply suggestions from code review

  matthewhoffman

  authored
  e5710f5

  Copy full SHA for e5710f5

• More code review updates

  Show description for 8b8e18b
  matthewhoffman

  committed
  8b8e18b

  Copy full SHA for 8b8e18b

• Generalize melting point depth dependence

  Show description for 87c33c2
  matthewhoffman

  committed
  87c33c2

  Copy full SHA for 87c33c2

• add package to extrapOceanData var_struct

  Show description for d39f30b
  matthewhoffman

  committed
  d39f30b

  Copy full SHA for d39f30b

• Adjust freezing temp depth dependence calc

  Show description for 4a834d4
  

  matthewhoffman

  and

  xylar

  authored
  4a834d4

  Copy full SHA for 4a834d4

Commits on Aug 27, 2024

• Merge branch 'hollyhan/mali/add_ocean_thermal_forcing_re-extrapolation' into MALI-Dev/develop

  Show description for d6d0f1f
  matthewhoffman

  committed
  d6d0f1f

  Copy full SHA for d6d0f1f

• Modified ocean extrapolation routine to take in a 3d ocean cavity mask

  cshafer

  committed
  0d7e8e0

  Copy full SHA for 0d7e8e0

• Modified which ocean layers are picked for creating TFocean and added check for invalid TF values

  cshafer

  committed
  93c7ad7

  Copy full SHA for 93c7ad7

Commits on Aug 28, 2024

• Revert "Modified which ocean layers are picked for creating TFocean and added check for invalid TF values"

  Show description for 932736e
  matthewhoffman

  committed
  932736e

  Copy full SHA for 932736e

Commits on Aug 29, 2024

• Handle seafloor and lakes in extrapolation module

  Show description for 5aa744c
  matthewhoffman

  committed
  5aa744c

  Copy full SHA for 5aa744c

• Replace verbose per-iteration log message with a summary

  Show description for 75c1940
  matthewhoffman

  committed
  75c1940

  Copy full SHA for 75c1940

• Apply suggestions/debugging from review

  Show description for 5385761
  alexolinhager

  committed
  5385761

  Copy full SHA for 5385761

Commits on Sep 3, 2024

• Remove effectivePressureSGH from ocean connection

  Show description for 81c0d02
  alexolinhager

  committed
  81c0d02

  Copy full SHA for 81c0d02

Commits on Sep 6, 2024

• Merge branch 'alexolinhager/subcycleAverageEffectivePressure' into MALI-Dev/develop

  Show description for e7d8d43
  matthewhoffman

  committed
  e7d8d43

  Copy full SHA for e7d8d43

Commits on Sep 20, 2024

• Create avgThermalForcing300m coupling field in MPAS-Ocean

  Show description for f14d71a
  matthewhoffman

  committed
  f14d71a

  Copy full SHA for f14d71a

• Define coupler fields for TF at 300 m and connect to OCN and GLC

  Show description for 2abf17a
  matthewhoffman

  committed
  2abf17a

  Copy full SHA for 2abf17a

• Update MALI config to use new TF field

  Show description for 4c18c45
  matthewhoffman

  committed
  4c18c45

  Copy full SHA for 4c18c45

• Define ocn2glc mapping for TF

  Show description for babbf3d
  matthewhoffman

  committed
  babbf3d

  Copy full SHA for babbf3d

• Implement new ocn2glc TF coupling

  Show description for 8c10e45
  matthewhoffman

  committed
  8c10e45

  Copy full SHA for 8c10e45

• Make depth at which to calc TF namelist-configurable

  matthewhoffman

  committed
  ffb207e

  Copy full SHA for ffb207e

• Better differentiate ocn->glc coupling for shelf and tf

  Show description for 3257d65
  matthewhoffman

  committed
  3257d65

  Copy full SHA for 3257d65

• Add TL319_IcoswISC30E3r5_gis1to10kmR2 grid specification

  Show description for ccc0416
  matthewhoffman

  committed
  ccc0416

  Copy full SHA for ccc0416

• Update mpas.gis1to10kmR2 mesh to include subglacial runoff field

  Show description for 90c1a1d
  matthewhoffman

  committed
  90c1a1d

  Copy full SHA for 90c1a1d

• Correct indexing for critical depth

  Show description for 5c03d40
  

  matthewhoffman

  and

  xylar

  committed
  5c03d40

  Copy full SHA for 5c03d40

• Add config_2d_thermal_forcing_depth to namelist system

  matthewhoffman

  committed
  3f2615d

  Copy full SHA for 3f2615d

• Add config_glc_thermal_forcing_coupling_mode option

  Show description for b6e4100
  matthewhoffman

  committed
  b6e4100

  Copy full SHA for b6e4100

• add ocn_c2_glctf to seq_infodata_PutData_explicit and getData

  matthewhoffman

  committed
  b8c3864

  Copy full SHA for b8c3864

• Add config_glc_thermal_forcing_coupling_mode to nl system

  Show description for 114c89e
  matthewhoffman

  committed
  114c89e

  Copy full SHA for 114c89e

• Create testmod and test for TF coupling feature

  matthewhoffman

  committed
  28a25dd

  Copy full SHA for 28a25dd

• Add TL319_oQU240wLI_gis20 configuration

  

  jonbob

  authored and

  matthewhoffman

  committed
  97b7fc0

  Copy full SHA for 97b7fc0

• Update test to use oQU240wLI and move to e3sm_ocnice_stealth_features

  matthewhoffman

  committed
  dccd205

  Copy full SHA for dccd205

Commits on Oct 12, 2024

• Rename OCN2GLC_*MAPNAME to OCN2GLC_SHELF_*FMAPNAME for new grids

  Show description for 43ef3b0
  matthewhoffman

  committed
  43ef3b0

  Copy full SHA for 43ef3b0

Commits on Oct 28, 2024

• Merge branch 'e3sm/master' into MALI-Dev/develop

  Show description for 07e3abf
  matthewhoffman

  committed
  07e3abf

  Copy full SHA for 07e3abf

Commits on Oct 31, 2024

• Fix segfault in hydro init due to using cellMask before accessing it

  matthewhoffman

  committed
  d0c3e77

  Copy full SHA for d0c3e77

• Merge branch 'matthewhoffman/mali/fix-hydro-init-segfault' into MALI-Dev/develop

  Show description for 114c373
  matthewhoffman

  committed
  114c373

  Copy full SHA for 114c373

Commits on Nov 5, 2024

• Minor cleanup from making bld files consistent with Registry

  jonbob

  committed
  e18f825

  Copy full SHA for e18f825

Commits on Nov 21, 2024

• Minor cleanup from code review

  matthewhoffman

  committed
  d52cea7

  Copy full SHA for d52cea7

• Clean up variable names

  Show description for 0f54aab
  matthewhoffman

  committed
  0f54aab

  Copy full SHA for 0f54aab

• Update variable descriptions in Registry

  Show description for 104e015
  matthewhoffman

  committed
  104e015

  Copy full SHA for 104e015

• Remove variables that are not needed for restarts

  matthewhoffman

  committed
  142105e

  Copy full SHA for 142105e

• Merge 'cshafer/mali/updates_to_ocean_thermal_forcing_extrapolation' into MALI-Dev/develop

  Show description for 05c6e5b
  matthewhoffman

  committed
  05c6e5b

  Copy full SHA for 05c6e5b

• Update layerNormalVelocity in each RK stage

  Show description for 0ad9390
  trhille

  committed
  0ad9390

  Copy full SHA for 0ad9390

• Only recalculate layerNormalVelocity when using RK time integration

  Show description for 90adcd9
  trhille

  committed
  90adcd9

  Copy full SHA for 90adcd9

• Merge branch 'trhille/mali/fix_layerNormalVelocity_bug' into MALI-Dev/develop

  Show description for 8fa61a6
  matthewhoffman

  committed
  8fa61a6

  Copy full SHA for 8fa61a6

• Add support for using flds_tf to wrap including the new field in the cpl

  jonbob

  committed
  27b3a29

  Copy full SHA for 27b3a29

Commits on Nov 26, 2024

• Modify TFocean vertical interpolation for depths outside of data range

  Show description for 3570441
  matthewhoffman

  committed
  3570441

  Copy full SHA for 3570441

Commits on Nov 28, 2024

• Fix indexing errors

  matthewhoffman

  committed
  e2055b7

  Copy full SHA for e2055b7

Commits on Nov 30, 2024

• Fix new indexing error introduced trying to fix indexing errors

  matthewhoffman

  committed
  a48ed3b

  Copy full SHA for a48ed3b

Commits on Dec 1, 2024

• Improve error checking in ocean extrap

  matthewhoffman

  committed
  cbb5ee3

  Copy full SHA for cbb5ee3

Commits on Dec 4, 2024

• Add perrWith=quiet for So_tf2d to avoid issues when it is not active

  jonbob

  committed
  e294a1d

  Copy full SHA for e294a1d

• Get and use ocn_c2_glctf from infodata in ocn and glc drivers

  jonbob

  committed
  53e7807

  Copy full SHA for 53e7807

Commits on Dec 11, 2024

• Clean-up ocn_c2_glc variables so they are correctly set by mpaso

  jonbob

  committed
  827be38

  Copy full SHA for 827be38

Commits on Dec 13, 2024

• add namelist vars for disabling P3 subgrid cldfrac

  Show description for e8f869e
  whannah1

  committed
  e8f869e

  Copy full SHA for e8f869e

• make P3 cld frac flags more verbose

  whannah1

  committed
  8503556

  Copy full SHA for 8503556

• add type and doc for namelist flags

  whannah1

  committed
  19ea8c7

  Copy full SHA for 19ea8c7

Commits on Dec 17, 2024

• refactor p3 cloud fraction flags

  whannah1

  committed
  dd0afd9

  Copy full SHA for dd0afd9

• remove old method

  whannah1

  committed
  94fa6d5

  Copy full SHA for 94fa6d5

Commits on Dec 19, 2024

• EAMxx: move cld_frac overrides to P3Runtime

  mahf708

  committed
  e5e8caf

  Copy full SHA for e5e8caf

• EAMxx: reorg query-cf-database utility

  Show description for cd6a6b9
  bartgol

  committed
  cd6a6b9

  Copy full SHA for cd6a6b9

• EAM: removed stale code in buildnml

  Show description for 3fe9539
  bartgol

  committed
  3fe9539

  Copy full SHA for 3fe9539

Commits on Dec 20, 2024

• EAMxx: fix md linting of README

  bartgol

  committed
  a166b45

  Copy full SHA for a166b45

Commits on Jan 4, 2025

• Update zOcean error check

  matthewhoffman

  committed
  165a6ac

  Copy full SHA for 165a6ac

Commits on Jan 6, 2025

• Merge branch 'whannah/emaxx/add-p3-cld-frac-flags' (PR #6849)

  Show description for 437fb5a
  tcclevenger

  authored
  437fb5a

  Copy full SHA for 437fb5a

• Update error message

  Show description for 2f684b3
  

  matthewhoffman

  and

  xylar

  authored
  2f684b3

  Copy full SHA for 2f684b3

Commits on Jan 7, 2025

• Merge branch 'matthewhoffman/mali/tf-vert-interp-fix' into MALI-Dev/develop

  Show description for 37848c5
  matthewhoffman

  committed
  37848c5

  Copy full SHA for 37848c5

• Merge branch 'matthewhoffman/mali/gis_ocn_to_glc_coupling' (PR #6632)

  Show description for 31d8b7b
  jonbob

  committed
  31d8b7b

  Copy full SHA for 31d8b7b

• Merge branch 'bartgol/eamxx/do-not-build-scripts-dir-with-cmake' (PR #6861)

  Show description for fbc8289
  bartgol

  authored
  fbc8289

  Copy full SHA for fbc8289

Commits on Jan 8, 2025

• TEMP MERGE OF MALI-DEV/DEVELOP

  Show description for d21e62f
  matthewhoffman

  committed
  d21e62f

  Copy full SHA for d21e62f

• Add new MALI ice-sheet coupling mode and make ice-shelf melt depend on it

  matthewhoffman

  committed
  bc49872

  Copy full SHA for bc49872

• Rename new MALI component option and use build-namelist to set

  Show description for 46ca299
  matthewhoffman

  committed
  46ca299

  Copy full SHA for 46ca299