NDSL port of the Grell-Fritas 2020 convection parameterization scheme - #1215

Open

CharlesKrop wants to merge 265 commits into

GEOS-ESM:dsl/developfrom

FlorianDeconinck:GF_2020

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 20, 2025

Ported and verified GF function 'get_buoyancy'
Katrina Fandrich
committed
591a828
lots of (untested) work on cumulus_parameterization setup
CharlesKrop
committed
f253294
Merge branch 'GF_2020' of https://github.com/FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
bd4982b

Commits on Oct 21, 2025

Ported and verified ke_to_heating. Some updates to GF shared_constants.
Katrina Fandrich
committed
12f3bf6
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
4a88694

Commits on Oct 22, 2025

Some updates to constants
Katrina Fandrich
committed
e6cee76
Ported and verified GF "get_precip_fluxes"
Katrina Fandrich
committed
a5521ac

Commits on Oct 23, 2025

Commits on Oct 24, 2025

cup_dd_edt stencil and translate test. Test fails in both debug and dace:cpu (<152 ULP). Will revisit this.
Katrina Fandrich
committed
7b1b89a
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
e95f2f3
'cup_env' and translate test
Katrina Fandrich
committed
182d24e
Some updates to 'cup_dd_edt'. Failures of < 7 ULP.
Katrina Fandrich
committed
fd5e7c2

Commits on Oct 27, 2025

First attempt at porting RainEvapBelowCloudbase. Test fails in debug and dace. Need to revisit.
Katrina Fandrich
committed
f6d8840

Commits on Oct 29, 2025

Ported and verified GF cloud_dissipation
Katrina Fandrich
committed
4542e62
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
1455b77

Commits on Oct 30, 2025

air density, highest moist static energy level, and a some minor fixes (renaming and such) to previously verified stencils
CharlesKrop
committed
28078e0

Commits on Oct 31, 2025

first bit of lcl work
CharlesKrop
committed
7e096be
changing imports to account for different Namelist location
CharlesKrop
committed
e212f27

Commits on Nov 4, 2025

Porting in progress of GF 'cup_up_moisture'
Katrina Fandrich
committed
2527426
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
9f676e4
GetLCL, EntrainmentRates and CloudBase first attempt - untested
CharlesKrop
committed
bb8f0e8
Merge branch 'GF_2020' of https://github.com/FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
a722257
Ported and verified GF 'cup_up_aa0'
Katrina Fandrich
committed
2949ac1

Commits on Nov 5, 2025

GetLCL fixes
CharlesKrop
committed
a8aed4f
Merge branch 'GF_2020' of https://github.com/FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
11648af
Some fixed
Katrina Fandrich
committed
dcad060
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
c7f207d
GetLCL fix - validates
CharlesKrop
committed
750ab4a
Merge branch 'GF_2020' of https://github.com/FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
78914a8

Commits on Nov 7, 2025

tested and verified ParcelMoistStaticEnergy and EntrainmentRates
CharlesKrop
committed
d44d86d

Commits on Nov 11, 2025

Commits on Nov 12, 2025

Some minor updates to GF functions and first port of FirstGuessMoistStaticEnergy in cumulus_parameterization.py. Still needs to be tested.
Katrina Fandrich
committed
d1e8d59
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
5e3b561
DowndraftMoistStaticEnergyAndMoistureBudget and UpdraftInCloudUpdraftAirTemperature (ported but not tested)
Katrina Fandrich
committed
5151752
More GF updates
Katrina Fandrich
committed
3de6c72

Commits on Nov 13, 2025

CloudTop (passes)
CharlesKrop
committed
c689075
more cloud top
CharlesKrop
committed
809b308
Ported more GF stencils.
Katrina Fandrich
committed
55e56e2
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
d5c0a9f
Notes on cumulus_parameterization port
Katrina Fandrich
committed
52809d6

Commits on Nov 17, 2025

More GF updates
Katrina Fandrich
committed
88328a5
UpdateMassFluxProfile (fails)
CharlesKrop
committed
bd59014
GF updates
Katrina Fandrich
committed
8c0511a
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
ac177b3

Commits on Nov 18, 2025

translate_setup_deep fixes
Katrina Fandrich
committed
e736038
fixed errors preventing translate tests from running
CharlesKrop
committed
7a978ee
Merge branch 'GF_2020' of https://github.com/FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
7c09eb2
More GF stencils
Katrina Fandrich
committed
9e5429c
CalculateMassEntrainmentDetrainment (passes)
CharlesKrop
committed
fe82a2c

Commits on Nov 19, 2025

lots of minor fixes + notes tracking test passage + proper warnings on constants
CharlesKrop
committed
f26685e

Commits on Nov 20, 2025

FirstGuessMoistStaticEnergy (does not verify) & GetBuoyancy (passes)
CharlesKrop
committed
14c0b8f
removing old test
CharlesKrop
committed
b363e9b
renamed test GF2020_CumulusParameterization_GetBuoyancy to GF2020_CumulusParameterization_GetBuoyancy_1 and added documentation tracking passage in CumulusParameterization
CharlesKrop
committed
6672cc2
missed a rename
CharlesKrop
committed
49b2ceb
GF updates
Katrina Fandrich
committed
6a58ebf
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
a4f536c
renamed three state variables
CharlesKrop
committed
1d7531c

Commits on Nov 21, 2025

Port and verification of GF MeltingProfile (passes)
Katrina Fandrich
committed
415e299
Verified GetBuoyancy 2 and 3 (passing)
Katrina Fandrich
committed
683a9a6

Commits on Nov 24, 2025

Verification of UpdraftInCloudAirTemperature
Katrina Fandrich
committed
9690761

Commits on Nov 25, 2025

Verified GF UpdraftInitialWorkfunctions
Katrina Fandrich
committed
91ea444

Commits on Nov 26, 2025

Verification of InCloudTemperature, TriggerFunctionConvection, and UpdraftCIN
Katrina Fandrich
committed
faef6b6

Commits on Dec 4, 2025

Verification of GF DiurnalCycle. Passes for all 3 plumes.
Katrina Fandrich
committed
88e462c
Verification of DowndraftWindshear. Fails by only 7 ULP.
Katrina Fandrich
committed
f6b5dfb

Commits on Dec 8, 2025

GF2020_CumulusParameterization_FirstGuessMoistStaticEnergy fix - now passes all plumes
CharlesKrop
committed
0f5fedf

Commits on Dec 9, 2025

Added C1DProfile and translate test. does not currently execute, need different simulation to properly test. Renamed a few constants, bringing them back in line with the fortan names
CharlesKrop
committed
4a5db43

Commits on Dec 12, 2025

Commits on Dec 15, 2025

Better error checks on C1DProfile
CharlesKrop
committed
89b8f77

Commits on Dec 17, 2025

new: updraft_moisture_profile, updraft_vertical_velocity. revised: melting_profile, updraft_temperature
CharlesKrop
committed
a43c9fd

Commits on Dec 19, 2025

Commits on Dec 20, 2025

Commits on Dec 23, 2025

First attempt at UpdraftMassFlux - does not validate.
CharlesKrop
committed
e314a7e
DowndraftLateralMassFlux - runs but does not validate
CharlesKrop
committed
0d209ff
updating notes
CharlesKrop
committed
23e5a23

Commits on Dec 24, 2025

Commits on Dec 26, 2025

Commits on Jan 2, 2026

DiurnalCycle (validates) & DowndraftWindshear (does not run, dimension mismatch)
CharlesKrop
committed
9b9f1c3
DowndraftWindshear (passes/off by handful of ULP)
CharlesKrop
committed
0e4a229
EnvironmentMassFlux (verifies)
CharlesKrop
committed
19fa9cc

Commits on Jan 3, 2026

Commits on Jan 6, 2026

Fixed UpdraftMassFlux. Passing now.
Katrina Fandrich
committed
47e1495
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
5c3ac0b
First bit of VerticalDiscretiztion (passes)
CharlesKrop
committed
a1bfd49
EntrainmentRates is mostly fixed. Only fails by 2 ULP.
Katrina Fandrich
committed
a6e7191

Commits on Jan 7, 2026

Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
5e9fe38
Updates to PartitionLiqIce and UpdraftMassFlux
Katrina Fandrich
committed
b3af4d2
VerticalDiscretization (passes)
CharlesKrop
committed
3b77ce6
notes on VerticalDiscretization passage in CumulusParameterization
CharlesKrop
committed
783dbb4
reworked the EntrainmentRates fix - made MIN_ENTRAINMENT_RATE a constant instead of a field, added documentation in CumulusParameterization
CharlesKrop
committed
b071db1
Low hanging fruit in get_convective_cloud_base_level. A proper solution may be more difficult, since the error is likely in the solver.
CharlesKrop
committed
f2ba20e
Forgot to update the call in CumulusParameterization for convective cloud base
CharlesKrop
committed
1cc309b
Fixing a bunch of calls with variable names that have changed
CharlesKrop
committed
55b8135
fixing bad test name in comment
CharlesKrop
committed
a663d0d

Commits on Jan 8, 2026

Fixed UpdraftVerticalVelocity.
Katrina Fandrich
committed
c0d797e
debug work on UpdraftMoisture
CharlesKrop
committed
a105093
Merge branch 'GF_2020' of https://github.com/FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
843aeb6
changing notes for UpdraftMoisture
CharlesKrop
committed
2376c3b
Fix for UpdraftMoisture (passes)
CharlesKrop
committed
43e440c
fixing bad docs
CharlesKrop
committed
d8c80f1
Fix for DowndraftLateralMassflux (passes)
CharlesKrop
committed
86273d6
Updating doc
CharlesKrop
committed
f8008e6
Removing untested shallow plume code from updraft_mass_flux and preventing execution
CharlesKrop
committed
7d13458
Docstring for updraft_mass_flux
CharlesKrop
committed
4f102ca

Commits on Jan 12, 2026

Fix for DowndraftMoisture (passes)
CharlesKrop
committed
c37c620
Added smooth_tendencies (passes) and reworked some error handling
CharlesKrop
committed
0c1a7ea

Commits on Jan 13, 2026

Some fixes to ConvectiveCloudBaseLevel. Still not passing.
Katrina Fandrich
committed
893e80f
Fix for VerticalDiscretization, some fields were miswired in serialbox and python, so test passes. rewired, test passes again
CharlesKrop
committed
76cdf5c
new serialbox names
CharlesKrop
committed
d21acaf
Added ModifyEnvironmentProfiles (passes)
CharlesKrop
committed
2221d5c
minor documentation updates
CharlesKrop
committed
00c1ca4
removing extra/unnecessary locals
CharlesKrop
committed
951b790
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
23e4e49
Translate tests for EnvConditions3 and EnvCloudLevels3
Katrina Fandrich
committed
1d97161

Commits on Jan 14, 2026

Fix for ConvectiveCloudBaseLevel (passes)
CharlesKrop
committed
7bd8aa9
Testing in progress of MoistStaticEnergyInCloud
Katrina Fandrich
committed
7addfe7
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
Katrina Fandrich
committed
60ef235
MoistStaticEnergyInsideCloud (passes)
Katrina Fandrich
committed
3ca3aa8
Translate test for KeToHeating. Passes.
Katrina Fandrich
committed
db30f2f
PrecipitationFlux (passes)
Katrina Fandrich
committed
be7afe1

Commits on Jan 16, 2026

Tests for RainEvapBelowCloudbase and OutputEvaporationFlux. Both passing. May need to update some var names.
Katrina Fandrich
committed
cd1d46f
Test for OutputDeepPrecipitaiton. Passes.
Katrina Fandrich
committed
6cfe082
Test for TracerOutput. Passes.
Katrina Fandrich
committed
9fa9010
Test for PrepareOutput. Passes.
Katrina Fandrich
committed
49c9b0c
Added UpdraftWorkfunctions (passes)
CharlesKrop
committed
ffab455
Merge branch 'GF_2020' of github.com:FlorianDeconinck/GEOSgcm_GridComp into GF_2020
CharlesKrop
committed
07440a4
Added UpdraftWorkfunction (passes) - actual commit, previous didn't work because of desynced head
CharlesKrop
committed
9d3ee22

Commits on Jan 18, 2026

Commits on Jan 19, 2026

Commits on Jan 20, 2026

Port and test for CloudBaseMassFlux. Passes.
Katrina Fandrich
committed
8259f36

Commits on Jan 21, 2026

first part of AtmosphericComposition test
CharlesKrop
committed
6b121c3

Commits on Jan 23, 2026

Commits on Jan 24, 2026

fixing bad file names and cleaning up serialbox variables
CharlesKrop
committed
4a7c45c

Commits on Jan 26, 2026

documentation update for C1DProfile
CharlesKrop
committed
9f0f513
Fixed UpdraftVerticalVelocity (passes)
CharlesKrop
committed
a3e0e16
Added errors to catch unimplemented paths
CharlesKrop
committed
2ed3acc
added gate sounding error
CharlesKrop
committed
a74573e
move locals from call to init
CharlesKrop
committed
533b980
removing old (unused) translate tests
CharlesKrop
committed
017647f
formatting
CharlesKrop
committed
e9e2c7f
removing error_code2 and error_code3 , should not have been in state
CharlesKrop
committed
b9290c1
moving fields from State to Locals
CharlesKrop
committed
69c9a33

Commits on Jan 28, 2026

Port and testing in progress for AtmosphericComposition
Katrina Fandrich
committed
84f087d

Commits on Jan 29, 2026

Commits on Feb 2, 2026

New field types for Convection Tracers
CharlesKrop
committed
61d198d
AtmosphericChemistry (passes) and updates to related files
CharlesKrop
committed
183ce88
better error handling
CharlesKrop
committed
da4441a
better tracer field type names
CharlesKrop
committed
fcae76e
Renaming "tracers" data dim to "convection_tracers" to get around the old systems in the quantity factory
CharlesKrop
committed
02bccbf
I am apparently incapable of spelling initialize correctly
CharlesKrop
committed
e8d1f0f
updated documentation for AtmosphericComposition
CharlesKrop
committed
d1221d5

Commits on Feb 3, 2026

Commits on Feb 4, 2026

Renaming inputs in CloudTopLevel
CharlesKrop
committed
6f3bff2
renaming inputs
CharlesKrop
committed
31042fb

Commits on Feb 5, 2026

fixing a DowndraftOriginLevel bug and removing dead code
CharlesKrop
committed
b2419d8
Fixing DowndraftOriginLevel bug
CharlesKrop
committed
a7857ea
fixing bug kstabm from locals to state, added plume dimension
CharlesKrop
committed
feaf73d
fixing data accessing bug
CharlesKrop
committed
f144c92
moving kstabm from locals to state
CharlesKrop
committed
5a6b615
minor bugfixes - bad names
CharlesKrop
committed
9ef2601
renaming serialbox fields
CharlesKrop
committed
b768657

Commits on Feb 10, 2026

Commits on Feb 11, 2026

rename class
CharlesKrop
committed
a9789b0
move file up one level
CharlesKrop
committed
b4b048f

Commits on Feb 12, 2026

better docs
CharlesKrop
committed
949b08c

Commits on Feb 13, 2026

removing debug stuff
CharlesKrop
committed
5b5d47f
add NDSLRuntime support
CharlesKrop
committed
d925c04

Commits on Feb 14, 2026

GF2020_Setup (passes, with nan-fortran fields not tested)
CharlesKrop
committed
a14ca5e

Commits on Feb 15, 2026

Commits on Feb 16, 2026

Commits on Feb 17, 2026

new local fields, renamed state fields, updated setup with changes
CharlesKrop
committed
ba0e2ea

Commits on Feb 18, 2026

added a field to be tested in setup and changed some serialbox names
CharlesKrop
committed
8ce5bb3

Commits on Feb 19, 2026

new serialbox variable name
CharlesKrop
committed
798c5bf
added _interface to a field in Setup to accurately reflect field shape
CharlesKrop
committed
d4bea2c
updated field name
CharlesKrop
committed
9773747

Commits on Feb 20, 2026

Commits on Feb 24, 2026

docstrings every stencil and class
CharlesKrop
committed
736d61c
first round of pre-commit. automatic fixes
CharlesKrop
committed
51e38f5
fix to allow GF2020_Setup to pass
CharlesKrop
committed
6975a85
precommit part 2 - manual changes. excess/duplicate imports, missing type definitions, bad conditionals
CharlesKrop
committed
3c83f78
Merge branch 'dsl/develop' into GF_2020
CharlesKrop
committed
e0b92e1
deleting files that somehow werent deleted by the merge
CharlesKrop
committed
e7d3f35
Merge remote-tracking branch 'GEOS-ESM/dsl/develop' into GF_2020
CharlesKrop
committed
995c7a7
more pre-commit changes after merge
CharlesKrop
committed
803710a

Commits on Feb 25, 2026