Skip to content

Auto PR - develop → MAPL-v3 - update exports to match M21C filespecs (GEOS_SurfaceGridComp.F90) #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathomp4 merged 20 commits into from
Dec 5, 2024
Merged

Auto PR - develop → MAPL-v3 - update exports to match M21C filespecs (GEOS_SurfaceGridComp.F90) #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6fbbcea
Added ZLCL and ZLFC connectivity from MOIST to CHEM
mmanyin Oct 30, 2024
23923cc
do not terminate SURFSTAT when running with CICE6
zhaobin74 Nov 5, 2024
6da8f54
only CICE4 needs this dealloc
zhaobin74 Nov 5, 2024
22238e2
update exports to match M21C filespecs (GEOS_SurfaceGridComp.F90)
gmao-rreichle Nov 6, 2024
6ee4ffa
update exports to match M21C filespecs (GEOS_CatchGridComp.F90)
gmao-rreichle Nov 6, 2024
f423cac
update exports to match M21C filespecs (GEOS_CatchCNGridComp.F90)
gmao-rreichle Nov 7, 2024
dbfa076
update exports to match M21C filespecs (GEOS_CatchCNCLM40GridComp.F90)
gmao-rreichle Nov 7, 2024
d1929a0
update exports to match M21C filespecs (GEOS_LakeGridComp.F90)
gmao-rreichle Nov 7, 2024
f0f8634
update exports to match M21C filespecs (GEOS_RouteGridComp.F90)
gmao-rreichle Nov 7, 2024
0bee7cb
update exports to match M21C filespecs (GEOS_VegDynGridComp.F90)
gmao-rreichle Nov 7, 2024
587a97c
update exports to match M21C filespecs (GEOS_LandiceGridComp.F90)
gmao-rreichle Nov 7, 2024
e31cda3
update exports to match M21C filespecs (GEOSsaltwater_GridComp/*.F90)
gmao-rreichle Nov 7, 2024
3790723
update exports to match M21C filespecs [stray LONG_NAME occurrences o…
gmao-rreichle Nov 7, 2024
fc85026
Fixed the RUNOFF logic. In particular, the conditions for allocating and
atrayano Dec 2, 2024
e86f375
Merge branch 'develop' into feature/mmanyin/two_imports_for_chem
sdrabenh Dec 4, 2024
18cb3ca
Merge pull request #1032 from GEOS-ESM/feature/rreichle/update_export…
sdrabenh Dec 5, 2024
132bedc
Merge branch 'develop' into feature/mmanyin/two_imports_for_chem
sdrabenh Dec 5, 2024
a6202b1
Merge pull request #1021 from GEOS-ESM/feature/mmanyin/two_imports_fo…
sdrabenh Dec 5, 2024
197de51
Merge branch 'develop' into bugfix/zhaobin1974/do-not-terminate-surfst
sdrabenh Dec 5, 2024
3e0164f
Merge pull request #1030 from GEOS-ESM/bugfix/zhaobin1974/do-not-term…
sdrabenh Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,8 +1215,8 @@ subroutine SetServices ( GC, RC )
call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/ 'RL ', 'QL ', 'QLTOT ', 'DQLDT ', &
'RI ', 'QI ', 'QITOT ', 'DQIDT ', &
'QLCN ', 'PFL_CN ', 'PFL_LSAN', &
'QICN ', 'PFI_CN ', 'PFI_LSAN', &
'QLCN ', 'PFL_CN ', 'PFL_LSAN', 'ZLCL ', &
'QICN ', 'PFI_CN ', 'PFI_LSAN', 'ZLFC ', &
'FCLD ', 'QCTOT ', 'CNV_QC ', &
'REV_LS ', 'REV_AN ', 'REV_CN ', 'TPREC ', &
'Q ', 'DQDT ', 'DQRL ', 'DQRC ', &
Expand Down
127 changes: 81 additions & 46 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp/GEOS_LakeGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_beam', &
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBVR', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -146,7 +146,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
UNITS = '1', &
SHORT_NAME = 'ALBVF', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -155,7 +155,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBNR', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -164,7 +164,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
UNITS = '1', &
SHORT_NAME = 'ALBNF', &
DIMS = MAPL_DimsTileOnly, &
Expand Down Expand Up @@ -192,7 +192,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'runoff_flux',&
LONG_NAME = 'runoff_total_flux' ,&
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'RUNOFF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
6 changes: 3 additions & 3 deletions ...Comp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_par_beam_flux',&
LONG_NAME = 'surface_downwelling_PAR_beam_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'DRPAR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -254,7 +254,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_par_diffuse_flux',&
LONG_NAME = 'surface_downwelling_PAR_diffuse_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'DFPAR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -346,7 +346,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'greeness_fraction' ,&
LONG_NAME = 'vegetation_greenness_fraction',&
UNITS = '1' ,&
SHORT_NAME = 'GRN' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
Loading
Loading