FlorianDeconinck · FlorianDeconinck · Apr 27, 2026 · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /@GEOSchem_GridComp
 /GEOSchem_GridComp
 /GEOSchem_GridComp@
+.vscode/
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GF_InterfaceMod.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GF_InterfaceMod.F90
@@ -39,8 +39,9 @@ module GEOS_GF_InterfaceMod
   real    :: SCLM_DEEP
   real    :: GF_MIN_AREA
   logical :: FIX_CNV_CLOUD
+  logical :: USE_PYMOIST_GF2020
 
-  public :: GF_Setup, GF_Initialize, GF_Run
+  public :: GF_Setup, GF_Initialize, GF_Run, GF_Finalize
 
 contains
 
@@ -72,13 +73,32 @@ subroutine GF_Setup (GC, CF, RC)
          DEFAULT    = 0.0,   RC=STATUS  )
          VERIFY_(STATUS)
 
+    call MAPL_AddInternalSpec(GC,                                &
+         SHORT_NAME = 'DSL__GF2020_LONS',                       &
+         LONG_NAME  = 'DSL_longitude',                           &
+         UNITS      = 'radians',                                &
+         DIMS       = MAPL_DimsHorzOnly,                        &
+         VLOCATION  = MAPL_VLocationNone,             RC=STATUS  )
+    VERIFY_(STATUS)
+
+    call MAPL_AddInternalSpec(GC,                                &
+         SHORT_NAME = 'DSL__GF2020_LATS',                       &
+         LONG_NAME  = 'DSL_longitude',                          &
+         UNITS      = 'radians',                                &
+         DIMS       = MAPL_DimsHorzOnly,                        &
+         VLOCATION  = MAPL_VLocationNone,             RC=STATUS  )
+    VERIFY_(STATUS)
+
     call MAPL_TimerAdd(GC, name="--GF", RC=STATUS)
     VERIFY_(STATUS)
 
 end subroutine GF_Setup
 
-subroutine GF_Initialize (MAPL, CLOCK, RC)
+subroutine GF_Initialize (MAPL, CF, CLOCK, IMPORT, EXPORT, RC)
     type (MAPL_MetaComp), intent(inout) :: MAPL
+    type (ESMF_Config),   intent(inout) :: CF
+    type (ESMF_State),    intent(inout) :: IMPORT
+    type (ESMF_State),    intent(inout) :: EXPORT
     type (ESMF_Clock),    intent(inout) :: CLOCK  ! The clock
     integer, optional                   :: RC  ! return code
     integer :: LM
@@ -113,6 +133,18 @@ subroutine GF_Initialize (MAPL, CLOCK, RC)
                                    Enabled      = .true.   ,    &
                                    Sticky       = .false.  , RC=STATUS); VERIFY_(STATUS)
 
+    call MAPL_GetResource(MAPL, USE_PYMOIST_GF2020, 'USE_PYMOIST_GF2020:', default=.FALSE., RC=STATUS); VERIFY_(STATUS)
+
+    if (USE_PYMOIST_GF2020) then
+      call MAPL_ConfigSetAttribute(CF, MOIST_DT, 'DSL__GF2020_DT', RC=STATUS); VERIFY_(STATUS)
+      call MAPL_GetResource(MAPL, GF_ENV_SETTING            , 'GF_ENV_SETTING:'        ,default= 'DYNAMICS', RC=STATUS); VERIFY_(STATUS)
+      if (trim(GF_ENV_SETTING)=='CURRENT') then
+         call MAPL_ConfigSetAttribute(CF, 0, 'DSL__GF_ENV_SETTING:', RC=STATUS); VERIFY_(STATUS)
+      elseif (trim(GF_ENV_SETTING)=='DYNAMICS') then 
+         call MAPL_ConfigSetAttribute(CF, 1, 'DSL__GF_ENV_SETTING:', RC=STATUS); VERIFY_(STATUS)
+      endif
+      call MAPL_pybridge_gcinit( "pyMoist.fortran.param_interfaces.convection.GF2020_interface", MAPL, IMPORT, EXPORT )
+    else
     if (LM .eq. 72) then
       call MAPL_GetResource(MAPL, USE_GF2020                , 'USE_GF2020:'            ,default= 0,    RC=STATUS );VERIFY_(STATUS)
     else
@@ -296,6 +328,8 @@ subroutine GF_Initialize (MAPL, CLOCK, RC)
       call MAPL_GetResource(MAPL, FIX_CNV_CLOUD       ,'FIX_CNV_CLOUD:'    ,default= .FALSE., RC=STATUS); VERIFY_(STATUS)
     ENDIF
 
+    endif ! USE_PYMOIST_GF2020
+
 end subroutine GF_Initialize
 
 
@@ -371,6 +405,9 @@ subroutine GF_Run (GC, IMPORT, EXPORT, CLOCK, RC)
     real, pointer, dimension(:,:  ) :: CNV_TOPP_DP, CNV_TOPP_MD, CNV_TOPP_SH
     real, pointer, dimension(:,:,:) :: PTR3D
     real, pointer, dimension(:,:  ) :: PTR2D
+
+    ! DSL fields
+    real, pointer, dimension(:,:) :: DSL__GF2020_LONS, DSL__GF2020_LATS
 
     call ESMF_ClockGetAlarm(clock, 'GF_RunAlarm', alarm, RC=STATUS); VERIFY_(STATUS)
     alarm_is_ringing = ESMF_AlarmIsRinging(alarm, RC=STATUS); VERIFY_(STATUS)
@@ -403,6 +440,14 @@ subroutine GF_Run (GC, IMPORT, EXPORT, CLOCK, RC)
          RC=STATUS )
     VERIFY_(STATUS)
 
+    if (USE_PYMOIST_GF2020) then
+      call MAPL_GetPointer(INTERNAL, DSL__GF2020_LONS, 'DSL__GF2020_LONS', RC=STATUS); VERIFY_(STATUS)
+      call MAPL_GetPointer(INTERNAL, DSL__GF2020_LATS, 'DSL__GF2020_LATS', RC=STATUS); VERIFY_(STATUS)
+      DSL__GF2020_LONS = LONS
+      DSL__GF2020_LATS = LATS
+      call MAPL_pybridge_gcrun_with_internal( "pyMoist.fortran.param_interfaces.convection.GF2020_interface", MAPL, IMPORT, EXPORT, INTERNAL )
+    else
+
     ! Internals
     call MAPL_GetPointer(INTERNAL, Q,      'Q'       , RC=STATUS); VERIFY_(STATUS)
     call MAPL_GetPointer(INTERNAL, QLLS,   'QLLS'    , RC=STATUS); VERIFY_(STATUS)
@@ -692,10 +737,33 @@ subroutine GF_Run (GC, IMPORT, EXPORT, CLOCK, RC)
       call MAPL_GetPointer(EXPORT, PTR3D, 'DQRC', RC=STATUS); VERIFY_(STATUS)
       if(associated(PTR3D)) PTR3D = CNV_PRC3 / GF_DT
 
+    endif ! USE_PYMOIST_GF2020
+
     call MAPL_TimerOff (MAPL,"--GF")
 
     endif
 
 end subroutine GF_Run
 
+subroutine GF_Finalize(gc, import, export, rc)
+
+  type(ESMF_GridComp), intent(inout) :: GC     ! Gridded component
+  type(ESMF_State),    intent(inout) :: IMPORT ! Import state
+  type(ESMF_State),    intent(inout) :: EXPORT ! Export state
+  integer, optional,   intent(  out) :: RC     ! Error code
+
+  type (MAPL_MetaComp), pointer   :: MAPL
+
+  ! Get my internal MAPL_Generic state
+  !-----------------------------------
+  call MAPL_GetObjectFromGC ( GC, MAPL, RC=STATUS)
+  VERIFY_(STATUS)
+
+
+  if (USE_PYMOIST_GF2020) then
+    call MAPL_pybridge_gcfinalize( "pyMoist.fortran.param_interfaces.convection.GF2020_interface", MAPL, IMPORT, EXPORT )
+  endif
+
+end subroutine GF_Finalize
+
 end module GEOS_GF_InterfaceMod
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
@@ -5162,7 +5162,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
     call MAPL_GetResource( MAPL, CCN_LND, 'NCCN_LND:', DEFAULT= 300., RC=STATUS); VERIFY_(STATUS) ! #/cm^3
 
     if (adjustl(CONVPAR_OPTION)=="RAS"    ) call     RAS_Initialize(MAPL,        RC=STATUS) ; VERIFY_(STATUS)
-    if (adjustl(CONVPAR_OPTION)=="GF"     ) call      GF_Initialize(MAPL, CLOCK, RC=STATUS) ; VERIFY_(STATUS)
+    if (adjustl(CONVPAR_OPTION)=="GF"     ) call      GF_Initialize(MAPL, CF, CLOCK, IMPORT, EXPORT, RC=STATUS) ; VERIFY_(STATUS)
     if (adjustl(SHALLOW_OPTION)=="UW"     ) call      UW_Initialize(MAPL, CF, CLOCK, IMPORT, EXPORT, RC=STATUS) ; VERIFY_(STATUS)
     if (adjustl(CLDMICR_OPTION)=="BACM_1M") call BACM_1M_Initialize(MAPL,        RC=STATUS) ; VERIFY_(STATUS)
     if (adjustl(CLDMICR_OPTION)=="GFDL_1M") call GFDL_1M_Initialize(MAPL, CF, IMPORT, EXPORT, RC=STATUS) ; VERIFY_(STATUS)
@@ -6094,6 +6094,7 @@ subroutine FINALIZE ( GC, IMPORT, EXPORT, CLOCK, RC )
 
     if (adjustl(CLDMICR_OPTION)=="GFDL_1M") call GFDL_1M_FINALIZE(GC, IMPORT, EXPORT, RC=STATUS) ; VERIFY_(STATUS)
     if (adjustl(SHALLOW_OPTION)=="UW"     ) call UW_Finalize(GC, IMPORT, EXPORT, RC=STATUS) ; VERIFY_(STATUS)
+    if (adjustl(CONVPAR_OPTION)=="GF"     ) call GF_Finalize(GC, IMPORT, EXPORT, RC=STATUS) ; VERIFY_(STATUS)
 
     ! Call Finalize for every child
     call MAPL_GenericFinalize(gc, import, export, clock, rc=status)

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/.gitignore b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/.gitignore
@@ -13,6 +13,7 @@ sandbox/
 .gt4py_cache/
 .gt_cache_*/
 .translate*/
+_dacegraphs/
 **/build/
 .venv/
 site/

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/.pre-commit-config.yaml b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/.pre-commit-config.yaml
@@ -9,14 +9,14 @@ repos:
     rev: 25.1.0
     hooks:
       - id: black
-        args: ["--line-length", "110"]
+        args: ["--line-length", "170"]
         additional_dependencies: ["click==8.0.4"]
 
   - repo: https://github.com/pre-commit/mirrors-isort
     rev: v5.10.1
     hooks:
       - id: isort
-        args: ["--profile", "black", "--line-length", "110"]
+        args: ["--profile", "black", "--line-length", "170"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.19.1
@@ -41,7 +41,7 @@ repos:
       - id: flake8
         name: flake8
         language_version: python3
-        args: ["--exclude=docs", "--ignore=W503,E302,E203,F841", "--max-line-length=110"]
+        args: ["--exclude=docs", "--ignore=W503,E302,E203,F841", "--max-line-length=170"]
         exclude: |
           (?x)^(
           .*/__init__.py |
@@ -50,7 +50,7 @@ repos:
         name: flake8 __init__.py files
         files: "__init__.py"
       # ignore unused import error in __init__.py files
-        args: ["--exclude=docs", "--ignore=W503,E302,E203,F841,F401", "--max-line-length=110"]
+        args: ["--exclude=docs", "--ignore=W503,E302,E203,F841,F401", "--max-line-length=170"]
 
   - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
     rev: v2.15.0

diff --git a/...Sphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/GF_2020.md b/...Sphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/GF_2020.md
@@ -0,0 +1,3 @@
+# GF_2020
+
+::: pyMoist.convection.GF_2020.GF_2020
diff --git a/...OSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/config.md b/...OSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/config.md
@@ -0,0 +1,3 @@
+# config
+
+::: pyMoist.convection.GF_2020.config
diff --git a/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/air_density.md b/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/air_density.md
@@ -0,0 +1,3 @@
+# air_density
+
+::: pyMoist.convection.GF_2020.air_density
diff --git a/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/buoyancy.md b/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/buoyancy.md
@@ -0,0 +1,3 @@
+# buoyancy
+
+::: pyMoist.convection.GF_2020.buoyancy
diff --git a/...idComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/check_config.md b/...idComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/check_config.md
@@ -0,0 +1,3 @@
+# check_config
+
+::: pyMoist.convection.GF_2020.check_config
diff --git a/...ist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/config.md b/...ist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/config.md
@@ -0,0 +1,3 @@
+# config
+
+::: pyMoist.convection.GF_2020.config
diff --git a/..._GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/constants.md b/..._GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/constants.md
@@ -0,0 +1,3 @@
+# constants
+
+::: pyMoist.convection.GF_2020.constants
diff --git a/.../pyMoist/docs/convection/GF_2020/cumulus_parameterization/convective_tracers.md b/.../pyMoist/docs/convection/GF_2020/cumulus_parameterization/convective_tracers.md
@@ -0,0 +1,3 @@
+# convective_tracers
+
+::: pyMoist.convection.GF_2020.convective_tracers
diff --git a/...st/docs/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.md b/...st/docs/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.md
@@ -0,0 +1,3 @@
+# cumulus_parameterization
+
+::: pyMoist.convection.GF_2020.cumulus_parameterization
diff --git a/...dComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/diurnal_cycle.md b/...dComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/diurnal_cycle.md
@@ -0,0 +1,3 @@
+# diurnal_cycle
+
+::: pyMoist.convection.GF_2020.diurnal_cycle
diff --git a/..._GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/downdraft.md b/..._GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/downdraft.md
@@ -0,0 +1,3 @@
+# downdraft
+
+::: pyMoist.convection.GF_2020.downdraft
diff --git a/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/entrainment.md b/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/entrainment.md
@@ -0,0 +1,3 @@
+# entrainment
+
+::: pyMoist.convection.GF_2020.entrainment
diff --git a/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/environment.md b/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/environment.md
@@ -0,0 +1,3 @@
+# environment
+
+::: pyMoist.convection.GF_2020.environment
diff --git a/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/field_types.md b/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/field_types.md
@@ -0,0 +1,3 @@
+# field_types
+
+::: pyMoist.convection.GF_2020.field_types
diff --git a/...GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/get_levels.md b/...GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/get_levels.md
@@ -0,0 +1,3 @@
+# get_levels
+
+::: pyMoist.convection.GF_2020.get_levels
diff --git a/...t/docs/convection/GF_2020/cumulus_parameterization/kinetic_energy_to_heating.md b/...t/docs/convection/GF_2020/cumulus_parameterization/kinetic_energy_to_heating.md
@@ -0,0 +1,3 @@
+# kinetic_energy_to_heating
+
+::: pyMoist.convection.GF_2020.kinetic_energy_to_heating
diff --git a/...pyMoist/docs/convection/GF_2020/cumulus_parameterization/large_scale_forcing.md b/...pyMoist/docs/convection/GF_2020/cumulus_parameterization/large_scale_forcing.md
@@ -0,0 +1,3 @@
+# large_scale_forcing
+
+::: pyMoist.convection.GF_2020.large_scale_forcing
diff --git a/...ist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/locals.md b/...ist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/locals.md
@@ -0,0 +1,3 @@
+# locals
+
+::: pyMoist.convection.GF_2020.locals
diff --git a/...p/pyMoist/docs/convection/GF_2020/cumulus_parameterization/mass_conservation.md b/...p/pyMoist/docs/convection/GF_2020/cumulus_parameterization/mass_conservation.md
@@ -0,0 +1,3 @@
+# mass_conservation
+
+::: pyMoist.convection.GF_2020.mass_conservation
diff --git a/...pyMoist/docs/convection/GF_2020/cumulus_parameterization/moist_static_energy.md b/...pyMoist/docs/convection/GF_2020/cumulus_parameterization/moist_static_energy.md
@@ -0,0 +1,3 @@
+# moist_static_energy
+
+::: pyMoist.convection.GF_2020.moist_static_energy
diff --git a/...t/docs/convection/GF_2020/cumulus_parameterization/plume_dependent_constants.md b/...t/docs/convection/GF_2020/cumulus_parameterization/plume_dependent_constants.md
@@ -0,0 +1,3 @@
+# plume_dependent_constants
+
+::: pyMoist.convection.GF_2020.plume_dependent_constants
diff --git a/...ist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/precip.md b/...ist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/precip.md
@@ -0,0 +1,3 @@
+# precip
+
+::: pyMoist.convection.GF_2020.precip
diff --git a/...Comp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/prepare_output.md b/...Comp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/prepare_output.md
@@ -0,0 +1,3 @@
+# prepare_output
+
+::: pyMoist.convection.GF_2020.prepare_output
diff --git a/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/profiles.md b/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/profiles.md
@@ -0,0 +1,3 @@
+# profiles
+
+::: pyMoist.convection.GF_2020.profiles
diff --git a/...pyMoist/docs/convection/GF_2020/cumulus_parameterization/setup/set_constants.md b/...pyMoist/docs/convection/GF_2020/cumulus_parameterization/setup/set_constants.md
@@ -0,0 +1,3 @@
+# set_constants
+
+::: pyMoist.convection.GF_2020.set_constants
diff --git a/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/setup/setup.md b/...ridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/setup/setup.md
@@ -0,0 +1,3 @@
+# setup
+
+::: pyMoist.convection.GF_2020.setup
diff --git a/...mp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/shared_functions.md b/...mp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/shared_functions.md
@@ -0,0 +1,3 @@
+# shared_functions
+
+::: pyMoist.convection.GF_2020.shared_functions
diff --git a/...omp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/shared_stencils.md b/...omp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/shared_stencils.md
@@ -0,0 +1,3 @@
+# shared_stencils
+
+::: pyMoist.convection.GF_2020.shared_stencils
diff --git a/..._GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/smoothing.md b/..._GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/smoothing.md
@@ -0,0 +1,3 @@
+# smoothing
+
+::: pyMoist.convection.GF_2020.smoothing
diff --git a/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/sounding.md b/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/sounding.md
@@ -0,0 +1,3 @@
+# sounding
+
+::: pyMoist.convection.GF_2020.sounding
diff --git a/...oist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/state.md b/...oist_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/state.md
@@ -0,0 +1,3 @@
+# state
+
+::: pyMoist.convection.GF_2020.state
diff --git a/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/triggers.md b/...t_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/triggers.md
@@ -0,0 +1,3 @@
+# triggers
+
+::: pyMoist.convection.GF_2020.triggers
diff --git a/...st_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/updraft.md b/...st_GridComp/pyMoist/docs/convection/GF_2020/cumulus_parameterization/updraft.md
@@ -0,0 +1,3 @@
+# updraft
+
+::: pyMoist.convection.GF_2020.updraft
diff --git a/...ist/docs/convection/GF_2020/cumulus_parameterization/vertical_discretization.md b/...ist/docs/convection/GF_2020/cumulus_parameterization/vertical_discretization.md
@@ -0,0 +1,3 @@
+# vertical_discretization
+
+::: pyMoist.convection.GF_2020.vertical_discretization
diff --git a/...physics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/finalize.md b/...physics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/finalize.md
@@ -0,0 +1,3 @@
+# finalize
+
+::: pyMoist.convection.GF_2020.finalize
diff --git a/...OSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/locals.md b/...OSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/locals.md
@@ -0,0 +1,3 @@
+# locals
+
+::: pyMoist.convection.GF_2020.locals
diff --git a/...EOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/setup.md b/...EOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/setup.md
@@ -0,0 +1,3 @@
+# setup
+
+::: pyMoist.convection.GF_2020.setup
diff --git a/...EOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/state.md b/...EOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/docs/convection/GF_2020/state.md
@@ -0,0 +1,3 @@
+# state
+
+::: pyMoist.convection.GF_2020.state
diff --git a/.../GEOSmoist_GridComp/pyMoist/docs/fortran/param_interfaces/convection/GF_2020.md b/.../GEOSmoist_GridComp/pyMoist/docs/fortran/param_interfaces/convection/GF_2020.md
@@ -0,0 +1,3 @@
+# GF_2020
+
+::: pyMoist.fortran.param_interfaces.convection.GF_2020
diff --git a/...EOSmoist_GridComp/pyMoist/docs/fortran/param_interfaces/microphysics/GFDL_1M.md b/...EOSmoist_GridComp/pyMoist/docs/fortran/param_interfaces/microphysics/GFDL_1M.md
@@ -0,0 +1,3 @@
+# GFDL_1M
+
+::: pyMoist.fortran.param_interfaces.microphysics.GFDL_1M
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/constants.py b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/constants.py
@@ -14,11 +14,11 @@
 EXPERIMENT_TRACERS = {"arm_97jul": 18, "arm_97jun": 18, "armtwp_ice": 18, "bomex": 18, "gcm-fp": 23}
 EXP_NAME = os.getenv("EXP_NAME", "")
 if EXP_NAME == "":
-    raise ValueError("EXP_NAME env var is not set - experiment unknown.")
+    raise ValueError(f"EXP_NAME env var is not set - experiment unknown. Options are {list(EXPERIMENT_TRACERS.keys())}")
 if EXP_NAME not in EXPERIMENT_TRACERS:
     raise ValueError(f"Experiment {EXP_NAME} unknown - tracers can't be initialized.")
 NCNST = _i32(EXPERIMENT_TRACERS[EXP_NAME])
-
+NUMBER_OF_TRACERS = NCNST
 
 NUMBER_OF_TRACERS = NCNST
 
@@ -136,11 +136,7 @@
 RHO_W = Float(1000.0)
 LDISS = Float(0.07)
 LK = Float(0.75)
-LBX = (
-    LDISS
-    * Float(1.0e3)
-    * (Float(3.0) / (Float(4.0) * MAPL_PI * LK * RHO_W * Float(1.0e-3))) ** (Float(1.0) / Float(3.0))
-)
+LBX = LDISS * Float(1.0e3) * (Float(3.0) / (Float(4.0) * MAPL_PI * LK * RHO_W * Float(1.0e-3))) ** (Float(1.0) / Float(3.0))
 LBE = Float(1.0) / Float(3.0) - Float(0.14)
 
 # Aer Activation constants
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# GF_2020

		::: pyMoist.convection.GF_2020.GF_2020
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# config

		::: pyMoist.convection.GF_2020.config
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# air_density

		::: pyMoist.convection.GF_2020.air_density
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# buoyancy

		::: pyMoist.convection.GF_2020.buoyancy
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# check_config

		::: pyMoist.convection.GF_2020.check_config
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# constants

		::: pyMoist.convection.GF_2020.constants
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# convective_tracers

		::: pyMoist.convection.GF_2020.convective_tracers
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# cumulus_parameterization

		::: pyMoist.convection.GF_2020.cumulus_parameterization
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# diurnal_cycle

		::: pyMoist.convection.GF_2020.diurnal_cycle
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# downdraft

		::: pyMoist.convection.GF_2020.downdraft