[DSL] Moist physics: UW, GFDL_1M and GF2020 by FlorianDeconinck · Pull Request #1231 · GEOS-ESM/GEOSgcm_GridComp

FlorianDeconinck · 2026-03-25T18:50:33Z

This PR brings the work of @katrinafandrich and @CharlesKrop to mainline GEOS.

It cover the first DSL-powered version of the UW and GFDL_1M parametrization. All the files exists in a pyMoist directoy within the GEOSmoist_GridComp directory. The pyMoist is a self-sustaining package but is not use like one for runs on Discover (see GEOS-ESM/GEOSgcm_App#826 PR and GEOS-ESM/ESMA_env#178).

The status of the parametrizations are:

GFDL_1M: first SCM experiments are showing some small instability. Expect follow up fixing PR.
UW: code is not up to DSL standards yet but is functional with good results on SCM experiments. Follow up PR to clean up and raise the code to DSL standards.
GF2020: code is slowly drifting but within reason. Expect following fixing PR.

Continuous integration:

A new github workflow ndsl-checks to run specific checks for pyMoist code on a paths hooks

Build:

Changed GEOSmoist_GridComp to a shared library so the python dynamically open it and fetch fortran hooks
Requires dependencies fms_r4 to be spelled out for the previous change to work
Install pyMoist python code in lib/Python

Change to the Fortran:

MoistGridComp
- A new Finalize function to allow for profiler data collection in the DSL
GFDL_1M_Interface
- Introducing a USE_PYMOIST_GFD1M flag to turn on/off the DSL code
- Introducing custom code for convection tracers that move them to Structure of Arrays - fitting the DSL needs
- A new Finalize function to allow for profiler data collection in the DSL
UW_Interface
- Introducing a USE_PYMOIST_UW flag to turn on/off the DSL code
- A new Finalize function to allow for profiler data collection in the DSL

Closes #1232

…to `shared`

FlorianDeconinck · 2026-03-26T20:23:53Z

Pulling back to draft for now as we have discovered a failing interaction between the Python and the model.

To reviewers: the Fortran is still correct and can be reviewed as-is.

…to avoid `icpx` failure

…terface call

mathomp4 · 2026-04-22T16:18:18Z

I just tested this with current GEOSgcm v11 along with GEOS-ESM/GEOSgcm_App#826

I believe all the other DSL PRs are in various tags on other repos.

Well, technically, I tested FlorianDeconinck#13 which is a merge of this PR ( #1231 ) and #1232

* v11: Remove FMS dependence in Moist * Fix call to gfdl * One last fms

FlorianDeconinck · 2026-04-24T15:21:00Z

Pulling back the PR to draft as we have additional ports (GF and UW unlocked for all levels) that have come to completion in the meantime. We will merge those and re-push the PR for merge.

In the interval, this PR still depends on

[DSL] Enable DSL code in SCM & GCM by using USE_DSL GEOSgcm_App#826

To be merged for the system to be usable on the HPC.

…14) * Updated UW to include code for LM=181. This code has not been tested. * Fixed UW interface and config for 181 level code. And set NUMBER_OF_TRACERS to NCNST. * Clean up of bad code calling down to Python * Minor fix to 181 level code * Added NOOP to get Fortran-In and -Out files * Added UW init to UW run to get a clean class each timestep * Reset state output vars to zero. Just a test. * Remove debug code. * Added flag to turn on/off state recorder. * Formatting fixes from `pre-commit run` and other PR fixes. --------- Co-authored-by: Katrina Fandrich <[email protected]> Co-authored-by: Florian Deconinck <[email protected]>

* GF2020: changed PLUME_ORDER to SHALLOW_MID_DEEP, bringing it back in line with fortran behavior * GF2020: removing dynamic intervals * GF2020: updating a couple translate tests that were missed in the DTIME --> DT_MOIST change * GF2020: Updated CumulusParameterization comments with new test results (using dace instead of debug backend) and updated a few comments to reflected changes to translate test names * GF2020: cleaning up large_scale_forcing * better .gitignore (#8) We've been tracking (in git) an empty vscode config and a temp graph from dace. This commit removes both files and - moves the `.vscode/` ignore "up" to the grid comp - adds `_dacegraphs/` to the ignore paths because it will only ever contain invalid/failed dace graphs for debugging. * GF2020: fix typos (#9) * GF2020: fix typos * fix typo in README * GF2020: fix ensemble_forcing_mid_plume (#10) Fix access of `updraft_lfc_level` inside `ensemble_forcing_mid_plume`. * GF2020: updating comments for LargeScaleForcing test * GF2020: removing a quantity --> np array --> stencil, passing a slice of the field to the stencil instead * GF2020: changing .field to .data in a few places * GF2020: .data to .field in translate test * Updated UW to include code for LM=181. This code has not been tested. * constants file was broken when GF2020 was manually merged, fixing * Fixed UW interface and config for 181 level code. And set NUMBER_OF_TRACERS to NCNST. * Clean up of bad code calling down to Python * Protect GetPointer call when association has been read to be False - to avoid `icpx` failure * fix: manually inline `cap_max_internal` in the right computation (#11) * unrelated: fall back to default number of tracers * unrelated: namelist is unused in `TestCore` * unrelated: fixing typos in GF_2020 * unrelated: fixing typos (2) in GF2020 * unrelated: start_level and lcl_level are both 2d * unrelated: unused variables * unrelated: cleanup dzh temporary The temprory `dzh` is only used in that scope and can be (manually) scalarized. No need to have an IJ-Field. * fix: manually inline `cap_max_internal` in the right computation `cap_max_internal` might be read before written (in case `MOIST_TRIGGER` is not `1`). DaCe wronly scalarizes the variable into both (previous) computation blocks. That leads to a potential read of undefined memory in the later computation block. Manually scoping `cap_max_internal` to the later block ensures that an initial value is written before the variable is read the first time. This is only a temp fix. I'll go debug the DaCe scalarization ... * GF2020: fix for DowndraftWindShear * GF2020: fix for DowndraftWindShear * cleanup: don't pass unused arguments --------- Co-authored-by: Charles Kropiewnicki <[email protected]> * [dsl]: Fix and cleanup GF2020 and GFDL_1M translate tests (#12) * fix/cleanup GF translate tests This PR fixes and cleans up translate tests of GF2020. The things you will find in this PR are: 1. Fix cumulus parametrization (args of `StaticControl`) 2. Clean up tests by not passing `namelist` down to `TestCore` if it isn't used there. 3. Fix some translate tests (e.g. GF2020) that were initializing `TranslateFortranData2Py` with `namelist`. `namelist` has never been an argument of that base class. 4. Cleaning up tests by not overloading `self.stencil_factory` in the subclass (the baseclass already assigns, given the right arguments are passed to the base class (see 3)). * fix / cleanup GFDL_1M translate tests This commit changes the translate tests of the GFDL_1M microphysics code. In particular, this PR 1. fixes tests that were initiliazing `TranslateFortranData2Py` with a namelist argument (there is no such argument). 2. cleans up translate tests that were shadowing `self.stencil_factory` in the subclasse (already done in the base class). * Updating tracer constants * GF2020: more guards and removing duplicate constant * GF2020 fortran side of the interface * GF2020 python side of the interface * GF2020 integration - python is numerically stable, but does not quite agree with the fortran (consistently about 0.5 degrees C too cold after the first day or so) * GF2020: Safer data dimension management * GF2020: fixed a few small bugs in the numerics * GF2020: put namelist back into a translate test * GF2020: disable two variables in GF2020_CumulusParameterization that fail b/c of a bug on the fortran side * GF2020: minor translate test updates * GF2020: bunch of changes/bugfixes in Setup & Finalize * Minor fix to 181 level code * GF2020: test reorganization renamed one test, moved another to a different folder * GF2020: fixes bringing the code in line with 11.8.1 * GF2020: flipped shallow and deep entrainment in the interface * GF2020: remove seed convection from inputs in GF2020 translate test * GFDL1M: few bugs in the interface * GF2020: stencil in setup needed K_INTERFACE_DIM instead of K_DIM * GF2020: fixing bad fortran conditional * GF2020: added dynamic call support to GF2020 test * GF2020: reworked lat/lon integration to python * GF2020: removing initial precipitable water fields from inputs of GF2020 and GF2020_Setup tests (after they were removed form the savepoint). changed the data source for the GF2020_Finalize savepoint for those two fields * GF2020: getting domain side properly for one of the setup stencils * fixing a dace bug * GF2020: fixed some bad defaults in the interface * GF2020: bugfix in finalize, putting optional outputs in their own stencils, with the execution hidden behind an existance check * GF2020: minor bugfixes in the interface - bad defaults and incorrect alloc=True * Added NOOP to get Fortran-In and -Out files * Added UW init to UW run to get a clean class each timestep * Reset state output vars to zero. Just a test. * Remove debug code. * GF2020: added a pbl level shift to the interface unlike microphysics, gf convection takes a level (pbl_level) from the model state. this level must be adjusted by one to python indexing before the python runs, then back to fortran indexing before it is passed back to the rest of the state * Added flag to turn on/off state recorder. * Formatting fixes from `pre-commit run` and other PR fixes. * GF2020: pre-commit - automatic changes, reformatting and such * GF2020: removing most instances of == True. some cannot be removed, as doing if (X and Y): breaks when x or why is a boolean. Error: "ValueError: Arithmetic expression is not allowed in boolean operation." * GF2020: changing == False to "not" * GF2020: bugfix, changing == True to == 1 for ENABLE_SHALLOW/MID/DEEP, as these fields are integers (albiet always 0 or 1) and not booleans * GF2020: unused imports * GF2020: two minor changes to make pre-commit happy * GF2020: type: ignores and noqas to make pre-commit happy * reverting changes that were made at various times that should not have been pushed * Changed pre-commit line length to 170 * Cast is enforced via dtype callable - which fails lint but is portable between numpy , cupy and python. Type ignored. --------- Co-authored-by: Roman Cattaneo <[email protected]> Co-authored-by: Katrina Fandrich <[email protected]> Co-authored-by: Florian Deconinck <[email protected]>

FlorianDeconinck · 2026-04-27T15:38:33Z

Branch back ready for merge. Grell-Freitas 2020 part of the fray news. Changes are restricted to the integration of the DSL into the GEOS_GF_InterfaceMod.

GEOS-ESM/GEOSgcm_App#826 still to be merged first

mathomp4 · 2026-04-28T11:49:14Z

Retested and still 0-diff.

Load global tables on device

FlorianDeconinck added 30 commits February 12, 2026 11:50

Initial repository + Fortran interface NDSL blocks

27c3632

CI

2a8784c

Saturation tables [UNTESTED]

65f9768

Shared code [UNTESTED]

4b0cd1d

Add constants tests, remove deprecated pyMoist_constants

888d07e

Add data for constants tests

1e4435a

Tests scripts

3c6e080

Run pytests checks

4afaced

Documentation

1ae9163

Update sat table README

e58c415

Renamed shared.generic_math -> shared.atmos_receipe

6e703cd

Missing translate_tests hook

10e0cb9

Propagate (and spellcheck) atmos_recipes

9f66eba

Fix docs

2ef5951

Initial UW integration - hooks to Fortran, hooks in python, docs

2a4b3d5

Modify get_data to new datashare tar.gz

65671be

Merge branch 'fdeconinck/feat/pyMoist_infra' into feature/dsl/UW

18b2d0a

Merge branch 'fdeconinck/feat/pyMoist_infra' into feature/dsl/GFDL1M

8da9043

Origin code copy + adding radiation coupling and redistribute clouds …

8347ef4

…to `shared`

Docs

0ff91cd

Fix GFDL_1M imports

aa04bde

Shif tests into their own directories to allow for mixed conftest

4cfcf10

Update CI for numerical unit tests

c5588ac

Merge branch 'fdeconinck/feat/pyMoist_infra' into feature/dsl/GFDL1M

0488d7d

Merge branch 'fdeconinck/feat/pyMoist_infra' into feature/dsl/UW

697b9ac

Update to latest GFDL_1M

658cea1

Fix bad import

c3ad36e

Translate tests suite

0c85885

README for GFDL1M

c1042f6

Update README with validation results

579e3df

Restore named based tracers

82bbf85

FlorianDeconinck marked this pull request as draft March 26, 2026 20:23

FlorianDeconinck added 4 commits March 27, 2026 11:24

Do not reset global tables

9df43c3

Protect GetPointer call when association has been read to be False - …

454569d

…to avoid `icpx` failure

Move CNV_* resource read that sets default (sic) outside of the in…

6c012dd

…terface call

Remove recorder for debug

c07ca5e

FlorianDeconinck marked this pull request as ready for review March 31, 2026 18:33

FlorianDeconinck and others added 2 commits April 8, 2026 12:30

Fix backend compiler override for new NDSL

9aa46ec

Merge branch 'develop' into dsl/feature/moist/UW_and_GFDL1M

ad453c9

mathomp4 mentioned this pull request Apr 22, 2026

Remove FMS dependence in Moist FlorianDeconinck/GEOSgcm_GridComp#13

Merged

Remove FMS dependence in Moist (#13)

e5e3160

* v11: Remove FMS dependence in Moist * Fix call to gfdl * One last fms

FlorianDeconinck changed the title ~~[DSL] Moist physics: UW & GFDL_1M~~ [DSL] Moist physics: UW, GFDL_1M and GF2020 Apr 24, 2026

FlorianDeconinck marked this pull request as draft April 24, 2026 15:19

katrinafandrich and others added 2 commits April 24, 2026 16:43

FlorianDeconinck marked this pull request as ready for review April 27, 2026 15:35

CharlesKrop and others added 3 commits April 28, 2026 11:56

removing debug statements from interfaces

47206b0

fixing GF2020 interface, minor change to moist_workaround required

11bf85d

Performance portable f the max reduce (TMP

c00678e

Load global tables on device

sdrabenh approved these changes May 6, 2026

View reviewed changes

mathomp4 approved these changes May 6, 2026

View reviewed changes

sdrabenh removed the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label May 6, 2026

mathomp4 added 0 diff structural Structural changes to repository that are zero-diff and removed 0 diff structural Structural changes to repository that are zero-diff labels May 6, 2026

mathomp4 merged commit 1b755ec into GEOS-ESM:develop May 6, 2026
14 of 15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DSL] Moist physics: UW, GFDL_1M and GF2020#1231

[DSL] Moist physics: UW, GFDL_1M and GF2020#1231
mathomp4 merged 168 commits intoGEOS-ESM:developfrom
FlorianDeconinck:dsl/feature/moist/UW_and_GFDL1M

FlorianDeconinck commented Mar 25, 2026 •

edited by mathomp4

Loading

Uh oh!

FlorianDeconinck commented Mar 26, 2026

Uh oh!

mathomp4 commented Apr 22, 2026

Uh oh!

FlorianDeconinck commented Apr 24, 2026

Uh oh!

FlorianDeconinck commented Apr 27, 2026

Uh oh!

mathomp4 commented Apr 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

FlorianDeconinck commented Mar 25, 2026 • edited by mathomp4 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FlorianDeconinck commented Mar 26, 2026

Uh oh!

mathomp4 commented Apr 22, 2026

Uh oh!

FlorianDeconinck commented Apr 24, 2026

Uh oh!

FlorianDeconinck commented Apr 27, 2026

Uh oh!

mathomp4 commented Apr 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

FlorianDeconinck commented Mar 25, 2026 •

edited by mathomp4

Loading