Skip to content
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

update file specs to match M21C #72

Merged
merged 14 commits into from
Jan 9, 2025
Merged

update file specs to match M21C #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
feddbcd
update file specs to match M21C:
gmao-rreichle Dec 16, 2024
5b155b7
Additional updates of file specs to match M21C (GEOS_EnsGridComp.F90,…
gmao-rreichle Dec 17, 2024
1d48a99
minor cleanup of comments and indentation (GEOS_EnsGridComp.F90)
gmao-rreichle Dec 17, 2024
9ebcc45
added land constants collection to GEOSldas_HIST.rc
gmao-rreichle Dec 17, 2024
542b843
added land constants variable names and definitions to tile_bin2nc4.F90
gmao-rreichle Dec 17, 2024
fd4c3bc
minor fixes to previous commits (GEOSldas_HIST.rc, tile_bin2nc4.F90)
gmao-rreichle Dec 18, 2024
4a0860c
additional fixes of previous commit (GEOS_EnsGridComp.F90, GEOSldas_H…
gmao-rreichle Dec 19, 2024
9e6a770
additional LONG_NAME fixes (tile_bin2nc4.F90)
gmao-rreichle Dec 19, 2024
b7071fc
removed "corrected" from LONG_NAME attributes of PREC*CORRLAND for co…
gmao-rreichle Dec 19, 2024
73d49b8
For 0-diff testing, reinstated bit-shaving and default regrid_method …
gmao-rreichle Dec 25, 2024
0d9b413
fix syntax error in GEOSldas_HIST.rc from previous commit
gmao-rreichle Jan 6, 2025
b0532ca
fixed previous commits in GEOSldas_HIST.rc: commented out SPLH [not r…
gmao-rreichle Jan 6, 2025
e1add91
minimal cleanup of comment from previous commit
gmao-rreichle Jan 6, 2025
c9ec191
renamed TSOIL[x]TILE in EnsGridComp to TP[x] for consistency with Cat…
gmao-rreichle Jan 8, 2025
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Updated read_obs_sm_ASCAT_EUMET to work with both original and revised file name templates.
- Updated subroutine read_obs_sm_ASCAT_EUMET() to work with both original and revised file name templates.
- Revised variable names (SHORT_NAME) and descriptions (LONG_NAME) to match M21C file specs.

### Fixed

Expand Down
377 changes: 205 additions & 172 deletions GEOSens_GridComp/GEOS_EnsGridComp.F90
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions GEOSlandassim_GridComp/GEOS_LandAssimGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ subroutine SetServices ( GC, RC )
! Exports for Catchment prognostics increments

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_temperature_saturated_zone' ,&
LONG_NAME = 'increment_surface_temperature_of_saturated_zone' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TCFSAT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -549,7 +549,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_temperature_transition_zone' ,&
LONG_NAME = 'increment_surface_temperature_of_unsaturated_zone' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TCFTRN_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -558,7 +558,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_temperature_wilting_zone' ,&
LONG_NAME = 'increment_surface_temperature_of_wilting_zone' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TCFWLT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -567,7 +567,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_specific_humidity_saturated_zone' ,&
LONG_NAME = 'increment_surface_specific_humidity_of_saturated_zone' ,&
UNITS = 'kg kg-1' ,&
SHORT_NAME = 'QCFSAT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -576,7 +576,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_specific_humidity_transition_zone' ,&
LONG_NAME = 'increment_surface_specific_humidity_of_unsaturated_zone' ,&
UNITS = 'kg kg-1' ,&
SHORT_NAME = 'QCFTRN_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -585,7 +585,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_specific_humidity_wilting_zone' ,&
LONG_NAME = 'increment_surface_specific_humidity_of_wilting_zone' ,&
UNITS = 'kg kg-1' ,&
SHORT_NAME = 'QCFWLT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -594,7 +594,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_interception_reservoir_capac' ,&
LONG_NAME = 'increment_vegetation_interception_water_storage' ,&
UNITS = 'kg m-2' ,&
SHORT_NAME = 'CAPAC_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -847,18 +847,18 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'soil_temperatures_layer_1_analysis' ,&
LONG_NAME = 'soil_temperature_layer_1_analysis' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TSOIL1_ANA' ,&
SHORT_NAME = 'TP1_ANA' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'soil_temperatures_layer_1_analysis_ensstd' ,&
LONG_NAME = 'soil_temperature_layer_1_analysis_ensstd' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TSOIL1_ANA_ENSSTD' ,&
SHORT_NAME = 'TP1_ANA_ENSSTD' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
Expand Down Expand Up @@ -1531,13 +1531,13 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
real, dimension(:),pointer :: RZMC_ana=>null() ! rootzone soil moisture
real, dimension(:),pointer :: PRMC_ana=>null() ! profile soil moisture
real, dimension(:),pointer :: TPSURF_ana=>null() ! tpsurf
real, dimension(:),pointer :: TSOIL1_ana=>null() ! tsoil1
real, dimension(:),pointer :: TP1_ana=>null() ! tsoil1

real, dimension(:),pointer :: SFMC_ana_ensstd=>null() ! surface soil moisture
real, dimension(:),pointer :: RZMC_ana_ensstd=>null() ! rootzone soil moisture
real, dimension(:),pointer :: PRMC_ana_ensstd=>null() ! profile soil moisture
real, dimension(:),pointer :: TPSURF_ana_ensstd=>null() ! tpsurf
real, dimension(:),pointer :: TSOIL1_ana_ensstd=>null() ! tsoil1
real, dimension(:),pointer :: TP1_ana_ensstd=>null() ! tsoil1

!! export for microwave radiative transfer model (mwRTM)

Expand Down Expand Up @@ -1699,7 +1699,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )

call MAPL_GetPointer(export, TPSURF_ana, 'TPSURF_ANA' ,rc=status)
VERIFY_(status)
call MAPL_GetPointer(export, TSOIL1_ana, 'TSOIL1_ANA' ,rc=status)
call MAPL_GetPointer(export, TP1_ana, 'TP1_ANA' ,rc=status)
VERIFY_(status)
call MAPL_GetPointer(export, SFMC_ana, 'WCSF_ANA' ,rc=status)
VERIFY_(status)
Expand All @@ -1709,7 +1709,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
VERIFY_(status)
call MAPL_GetPointer(export, TPSURF_ana_ensstd, 'TPSURF_ANA_ENSSTD' ,rc=status)
VERIFY_(status)
call MAPL_GetPointer(export, TSOIL1_ana_ensstd, 'TSOIL1_ANA_ENSSTD' ,rc=status)
call MAPL_GetPointer(export, TP1_ana_ensstd, 'TP1_ANA_ENSSTD' ,rc=status)
VERIFY_(status)
call MAPL_GetPointer(export, SFMC_ana_ensstd, 'WCSF_ANA_ENSSTD' ,rc=status)
VERIFY_(status)
Expand Down Expand Up @@ -2046,13 +2046,13 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
if(associated(RZMC_ana)) RZMC_ana(:) = cat_diagS_ensavg(:)%rzmc
if(associated(PRMC_ana)) PRMC_ana(:) = cat_diagS_ensavg(:)%prmc
if(associated(TPSURF_ana)) TPSURF_ana(:) = cat_diagS_ensavg(:)%tsurf
if(associated(TSOIL1_ana)) TSOIL1_ana(:) = cat_diagS_ensavg(:)%tp(1) + MAPL_TICE ! convert to K
if(associated(TP1_ana)) TP1_ana(:) = cat_diagS_ensavg(:)%tp(1) + MAPL_TICE ! convert to K

if(associated(SFMC_ana_ensstd)) SFMC_ana_ensstd(:) = max( cat_diagS_ensstd(:)%sfmc , 0. )
if(associated(RZMC_ana_ensstd)) RZMC_ana_ensstd(:) = max( cat_diagS_ensstd(:)%rzmc , 0. )
if(associated(PRMC_ana_ensstd)) PRMC_ana_ensstd(:) = max( cat_diagS_ensstd(:)%prmc , 0. )
if(associated(TPSURF_ana_ensstd)) TPSURF_ana_ensstd(:) = max( cat_diagS_ensstd(:)%tsurf , 0. )
if(associated(TSOIL1_ana_ensstd)) TSOIL1_ana_ensstd(:) = max( cat_diagS_ensstd(:)%tp(1) , 0. )
if(associated(TP1_ana_ensstd)) TP1_ana_ensstd(:) = max( cat_diagS_ensstd(:)%tp(1) , 0. )

if(associated(MWRTM_VEGOPACITY)) MWRTM_VEGOPACITY(:) = mwRTM_param(:)%VEGOPACITY

Expand Down
14 changes: 7 additions & 7 deletions GEOSlandassim_GridComp/GEOSexportcatchincr_GridComp/GEOS_ExportCatchIncrGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ subroutine SetServices ( GC, RC )
! Exports for Catchment prognostics increments

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_temperature_saturated_zone' ,&
LONG_NAME = 'increment_surface_temperature_saturated_zone' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TCFSAT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -97,7 +97,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_temperature_transition_zone' ,&
LONG_NAME = 'increment_surface_temperature_of_unsaturated_zone' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TCFTRN_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -106,7 +106,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_temperature_wilting_zone' ,&
LONG_NAME = 'increment_surface_temperature_of_wilting_zone' ,&
UNITS = 'K' ,&
SHORT_NAME = 'TCFWLT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -115,7 +115,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_specific_humidity_saturated_zone' ,&
LONG_NAME = 'increment_surface_specific_humidity_of_saturated_zone' ,&
UNITS = 'kg kg-1' ,&
SHORT_NAME = 'QCFSAT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -124,7 +124,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_specific_humidity_transition_zone' ,&
LONG_NAME = 'increment_surface_specific_humidity_of_unsaturated_zone' ,&
UNITS = 'kg kg-1' ,&
SHORT_NAME = 'QCFTRN_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -133,7 +133,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_canopy_specific_humidity_wilting_zone' ,&
LONG_NAME = 'increment_surface_specific_humidity_of_wilting_zone' ,&
UNITS = 'kg kg-1' ,&
SHORT_NAME = 'QCFWLT_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -142,7 +142,7 @@ subroutine SetServices ( GC, RC )
_VERIFY(STATUS)

call MAPL_AddExportSpec(GC ,&
LONG_NAME = 'increment_interception_reservoir_capac' ,&
LONG_NAME = 'increment_vegetation_interception_water_storage' ,&
UNITS = 'kg m-2' ,&
SHORT_NAME = 'CAPAC_INCR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
Loading
Loading