Skip to content

Commit f34458c

Browse files
gmao-rreichlegmao-rreichle
authored
Merge branch 'develop' into feature/amfox/obs_availability_dates
2 parents 5d32a93 + 1134dff commit f34458c

File tree

7 files changed

+662
-534
lines changed

7 files changed

+662
-534
lines changed

‎CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
### Changed
1717

18-
- Updated read_obs_sm_ASCAT_EUMET to work with both original and revised file name templates.
18+
- Updated subroutine read_obs_sm_ASCAT_EUMET() to work with both original and revised file name templates.
1919
- Updated subroutines read_obs_sm_ASCAT_EUMET(), read_obs_SMAP_halforbit_Tb(), read_obs_SMOS() and read_obs_MODIS_SCF() with hardcoded time ranges for when observations are available and should be read.
20+
- Revised variable names (SHORT_NAME) and descriptions (LONG_NAME) to match M21C file specs.
2021

2122
### Fixed
2223

‎GEOSens_GridComp/GEOS_EnsGridComp.F90

+205-172
Large diffs are not rendered by default.

‎GEOSlandassim_GridComp/GEOS_LandAssimGridComp.F90

+17-17
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ subroutine SetServices ( GC, RC )
540540
! Exports for Catchment prognostics increments
541541

542542
call MAPL_AddExportSpec(GC ,&
543-
LONG_NAME = 'increment_canopy_temperature_saturated_zone' ,&
543+
LONG_NAME = 'increment_surface_temperature_of_saturated_zone' ,&
544544
UNITS = 'K' ,&
545545
SHORT_NAME = 'TCFSAT_INCR' ,&
546546
DIMS = MAPL_DimsTileOnly ,&
@@ -549,7 +549,7 @@ subroutine SetServices ( GC, RC )
549549
_VERIFY(STATUS)
550550

551551
call MAPL_AddExportSpec(GC ,&
552-
LONG_NAME = 'increment_canopy_temperature_transition_zone' ,&
552+
LONG_NAME = 'increment_surface_temperature_of_unsaturated_zone' ,&
553553
UNITS = 'K' ,&
554554
SHORT_NAME = 'TCFTRN_INCR' ,&
555555
DIMS = MAPL_DimsTileOnly ,&
@@ -558,7 +558,7 @@ subroutine SetServices ( GC, RC )
558558
_VERIFY(STATUS)
559559

560560
call MAPL_AddExportSpec(GC ,&
561-
LONG_NAME = 'increment_canopy_temperature_wilting_zone' ,&
561+
LONG_NAME = 'increment_surface_temperature_of_wilting_zone' ,&
562562
UNITS = 'K' ,&
563563
SHORT_NAME = 'TCFWLT_INCR' ,&
564564
DIMS = MAPL_DimsTileOnly ,&
@@ -567,7 +567,7 @@ subroutine SetServices ( GC, RC )
567567
_VERIFY(STATUS)
568568

569569
call MAPL_AddExportSpec(GC ,&
570-
LONG_NAME = 'increment_canopy_specific_humidity_saturated_zone' ,&
570+
LONG_NAME = 'increment_surface_specific_humidity_of_saturated_zone' ,&
571571
UNITS = 'kg kg-1' ,&
572572
SHORT_NAME = 'QCFSAT_INCR' ,&
573573
DIMS = MAPL_DimsTileOnly ,&
@@ -576,7 +576,7 @@ subroutine SetServices ( GC, RC )
576576
_VERIFY(STATUS)
577577

578578
call MAPL_AddExportSpec(GC ,&
579-
LONG_NAME = 'increment_canopy_specific_humidity_transition_zone' ,&
579+
LONG_NAME = 'increment_surface_specific_humidity_of_unsaturated_zone' ,&
580580
UNITS = 'kg kg-1' ,&
581581
SHORT_NAME = 'QCFTRN_INCR' ,&
582582
DIMS = MAPL_DimsTileOnly ,&
@@ -585,7 +585,7 @@ subroutine SetServices ( GC, RC )
585585
_VERIFY(STATUS)
586586

587587
call MAPL_AddExportSpec(GC ,&
588-
LONG_NAME = 'increment_canopy_specific_humidity_wilting_zone' ,&
588+
LONG_NAME = 'increment_surface_specific_humidity_of_wilting_zone' ,&
589589
UNITS = 'kg kg-1' ,&
590590
SHORT_NAME = 'QCFWLT_INCR' ,&
591591
DIMS = MAPL_DimsTileOnly ,&
@@ -594,7 +594,7 @@ subroutine SetServices ( GC, RC )
594594
_VERIFY(STATUS)
595595

596596
call MAPL_AddExportSpec(GC ,&
597-
LONG_NAME = 'increment_interception_reservoir_capac' ,&
597+
LONG_NAME = 'increment_vegetation_interception_water_storage' ,&
598598
UNITS = 'kg m-2' ,&
599599
SHORT_NAME = 'CAPAC_INCR' ,&
600600
DIMS = MAPL_DimsTileOnly ,&
@@ -847,18 +847,18 @@ subroutine SetServices ( GC, RC )
847847
VERIFY_(STATUS)
848848

849849
call MAPL_AddExportSpec(GC ,&
850-
LONG_NAME = 'soil_temperatures_layer_1_analysis' ,&
850+
LONG_NAME = 'soil_temperature_layer_1_analysis' ,&
851851
UNITS = 'K' ,&
852-
SHORT_NAME = 'TSOIL1_ANA' ,&
852+
SHORT_NAME = 'TP1_ANA' ,&
853853
DIMS = MAPL_DimsTileOnly ,&
854854
VLOCATION = MAPL_VLocationNone ,&
855855
RC=STATUS )
856856
VERIFY_(STATUS)
857857

858858
call MAPL_AddExportSpec(GC ,&
859-
LONG_NAME = 'soil_temperatures_layer_1_analysis_ensstd' ,&
859+
LONG_NAME = 'soil_temperature_layer_1_analysis_ensstd' ,&
860860
UNITS = 'K' ,&
861-
SHORT_NAME = 'TSOIL1_ANA_ENSSTD' ,&
861+
SHORT_NAME = 'TP1_ANA_ENSSTD' ,&
862862
DIMS = MAPL_DimsTileOnly ,&
863863
VLOCATION = MAPL_VLocationNone ,&
864864
RC=STATUS )
@@ -1531,13 +1531,13 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
15311531
real, dimension(:),pointer :: RZMC_ana=>null() ! rootzone soil moisture
15321532
real, dimension(:),pointer :: PRMC_ana=>null() ! profile soil moisture
15331533
real, dimension(:),pointer :: TPSURF_ana=>null() ! tpsurf
1534-
real, dimension(:),pointer :: TSOIL1_ana=>null() ! tsoil1
1534+
real, dimension(:),pointer :: TP1_ana=>null() ! tsoil1
15351535

15361536
real, dimension(:),pointer :: SFMC_ana_ensstd=>null() ! surface soil moisture
15371537
real, dimension(:),pointer :: RZMC_ana_ensstd=>null() ! rootzone soil moisture
15381538
real, dimension(:),pointer :: PRMC_ana_ensstd=>null() ! profile soil moisture
15391539
real, dimension(:),pointer :: TPSURF_ana_ensstd=>null() ! tpsurf
1540-
real, dimension(:),pointer :: TSOIL1_ana_ensstd=>null() ! tsoil1
1540+
real, dimension(:),pointer :: TP1_ana_ensstd=>null() ! tsoil1
15411541

15421542
!! export for microwave radiative transfer model (mwRTM)
15431543

@@ -1699,7 +1699,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
16991699

17001700
call MAPL_GetPointer(export, TPSURF_ana, 'TPSURF_ANA' ,rc=status)
17011701
VERIFY_(status)
1702-
call MAPL_GetPointer(export, TSOIL1_ana, 'TSOIL1_ANA' ,rc=status)
1702+
call MAPL_GetPointer(export, TP1_ana, 'TP1_ANA' ,rc=status)
17031703
VERIFY_(status)
17041704
call MAPL_GetPointer(export, SFMC_ana, 'WCSF_ANA' ,rc=status)
17051705
VERIFY_(status)
@@ -1709,7 +1709,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
17091709
VERIFY_(status)
17101710
call MAPL_GetPointer(export, TPSURF_ana_ensstd, 'TPSURF_ANA_ENSSTD' ,rc=status)
17111711
VERIFY_(status)
1712-
call MAPL_GetPointer(export, TSOIL1_ana_ensstd, 'TSOIL1_ANA_ENSSTD' ,rc=status)
1712+
call MAPL_GetPointer(export, TP1_ana_ensstd, 'TP1_ANA_ENSSTD' ,rc=status)
17131713
VERIFY_(status)
17141714
call MAPL_GetPointer(export, SFMC_ana_ensstd, 'WCSF_ANA_ENSSTD' ,rc=status)
17151715
VERIFY_(status)
@@ -2046,13 +2046,13 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
20462046
if(associated(RZMC_ana)) RZMC_ana(:) = cat_diagS_ensavg(:)%rzmc
20472047
if(associated(PRMC_ana)) PRMC_ana(:) = cat_diagS_ensavg(:)%prmc
20482048
if(associated(TPSURF_ana)) TPSURF_ana(:) = cat_diagS_ensavg(:)%tsurf
2049-
if(associated(TSOIL1_ana)) TSOIL1_ana(:) = cat_diagS_ensavg(:)%tp(1) + MAPL_TICE ! convert to K
2049+
if(associated(TP1_ana)) TP1_ana(:) = cat_diagS_ensavg(:)%tp(1) + MAPL_TICE ! convert to K
20502050

20512051
if(associated(SFMC_ana_ensstd)) SFMC_ana_ensstd(:) = max( cat_diagS_ensstd(:)%sfmc , 0. )
20522052
if(associated(RZMC_ana_ensstd)) RZMC_ana_ensstd(:) = max( cat_diagS_ensstd(:)%rzmc , 0. )
20532053
if(associated(PRMC_ana_ensstd)) PRMC_ana_ensstd(:) = max( cat_diagS_ensstd(:)%prmc , 0. )
20542054
if(associated(TPSURF_ana_ensstd)) TPSURF_ana_ensstd(:) = max( cat_diagS_ensstd(:)%tsurf , 0. )
2055-
if(associated(TSOIL1_ana_ensstd)) TSOIL1_ana_ensstd(:) = max( cat_diagS_ensstd(:)%tp(1) , 0. )
2055+
if(associated(TP1_ana_ensstd)) TP1_ana_ensstd(:) = max( cat_diagS_ensstd(:)%tp(1) , 0. )
20562056

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

‎GEOSlandassim_GridComp/GEOSexportcatchincr_GridComp/GEOS_ExportCatchIncrGridComp.F90

+7-7
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ subroutine SetServices ( GC, RC )
8888
! Exports for Catchment prognostics increments
8989

9090
call MAPL_AddExportSpec(GC ,&
91-
LONG_NAME = 'increment_canopy_temperature_saturated_zone' ,&
91+
LONG_NAME = 'increment_surface_temperature_saturated_zone' ,&
9292
UNITS = 'K' ,&
9393
SHORT_NAME = 'TCFSAT_INCR' ,&
9494
DIMS = MAPL_DimsTileOnly ,&
@@ -97,7 +97,7 @@ subroutine SetServices ( GC, RC )
9797
_VERIFY(STATUS)
9898

9999
call MAPL_AddExportSpec(GC ,&
100-
LONG_NAME = 'increment_canopy_temperature_transition_zone' ,&
100+
LONG_NAME = 'increment_surface_temperature_of_unsaturated_zone' ,&
101101
UNITS = 'K' ,&
102102
SHORT_NAME = 'TCFTRN_INCR' ,&
103103
DIMS = MAPL_DimsTileOnly ,&
@@ -106,7 +106,7 @@ subroutine SetServices ( GC, RC )
106106
_VERIFY(STATUS)
107107

108108
call MAPL_AddExportSpec(GC ,&
109-
LONG_NAME = 'increment_canopy_temperature_wilting_zone' ,&
109+
LONG_NAME = 'increment_surface_temperature_of_wilting_zone' ,&
110110
UNITS = 'K' ,&
111111
SHORT_NAME = 'TCFWLT_INCR' ,&
112112
DIMS = MAPL_DimsTileOnly ,&
@@ -115,7 +115,7 @@ subroutine SetServices ( GC, RC )
115115
_VERIFY(STATUS)
116116

117117
call MAPL_AddExportSpec(GC ,&
118-
LONG_NAME = 'increment_canopy_specific_humidity_saturated_zone' ,&
118+
LONG_NAME = 'increment_surface_specific_humidity_of_saturated_zone' ,&
119119
UNITS = 'kg kg-1' ,&
120120
SHORT_NAME = 'QCFSAT_INCR' ,&
121121
DIMS = MAPL_DimsTileOnly ,&
@@ -124,7 +124,7 @@ subroutine SetServices ( GC, RC )
124124
_VERIFY(STATUS)
125125

126126
call MAPL_AddExportSpec(GC ,&
127-
LONG_NAME = 'increment_canopy_specific_humidity_transition_zone' ,&
127+
LONG_NAME = 'increment_surface_specific_humidity_of_unsaturated_zone' ,&
128128
UNITS = 'kg kg-1' ,&
129129
SHORT_NAME = 'QCFTRN_INCR' ,&
130130
DIMS = MAPL_DimsTileOnly ,&
@@ -133,7 +133,7 @@ subroutine SetServices ( GC, RC )
133133
_VERIFY(STATUS)
134134

135135
call MAPL_AddExportSpec(GC ,&
136-
LONG_NAME = 'increment_canopy_specific_humidity_wilting_zone' ,&
136+
LONG_NAME = 'increment_surface_specific_humidity_of_wilting_zone' ,&
137137
UNITS = 'kg kg-1' ,&
138138
SHORT_NAME = 'QCFWLT_INCR' ,&
139139
DIMS = MAPL_DimsTileOnly ,&
@@ -142,7 +142,7 @@ subroutine SetServices ( GC, RC )
142142
_VERIFY(STATUS)
143143

144144
call MAPL_AddExportSpec(GC ,&
145-
LONG_NAME = 'increment_interception_reservoir_capac' ,&
145+
LONG_NAME = 'increment_vegetation_interception_water_storage' ,&
146146
UNITS = 'kg m-2' ,&
147147
SHORT_NAME = 'CAPAC_INCR' ,&
148148
DIMS = MAPL_DimsTileOnly ,&

0 commit comments

Comments
 (0)