Skip to content

Commit c9ec191

Browse files
gmao-rreichlegmao-rreichle
committed
renamed TSOIL[x]TILE in EnsGridComp to TP[x] for consistency with CatchGridComp (GEOS_EnsGridComp.F90, GEOS_LandAssimGridComp.F90, GEOSldas_HIST.rc, process_hist.csh)
1 parent e1add91 commit c9ec191

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

‎GEOSens_GridComp/GEOS_EnsGridComp.F90‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ subroutine SetServices(gc, rc)
860860
call MAPL_AddExportSpec(GC, &
861861
LONG_NAME = 'soil_temperature_layer_1' ,&
862862
UNITS = 'K' ,&
863-
SHORT_NAME = 'TSOIL1TILE' ,&
863+
SHORT_NAME = 'TP1' ,&
864864
DIMS = MAPL_DimsTileOnly ,&
865865
VLOCATION = MAPL_VLocationNone ,&
866866
RC=STATUS )
@@ -869,7 +869,7 @@ subroutine SetServices(gc, rc)
869869
call MAPL_AddExportSpec(GC, &
870870
LONG_NAME = 'soil_temperature_layer_1_ensstd' ,&
871871
UNITS = 'K' ,&
872-
SHORT_NAME = 'TSOIL1TILE_ENSSTD' ,&
872+
SHORT_NAME = 'TP1_ENSSTD' ,&
873873
DIMS = MAPL_DimsTileOnly ,&
874874
VLOCATION = MAPL_VLocationNone ,&
875875
RC=STATUS )
@@ -878,7 +878,7 @@ subroutine SetServices(gc, rc)
878878
call MAPL_AddExportSpec(GC, &
879879
LONG_NAME = 'soil_temperature_layer_2' ,&
880880
UNITS = 'K' ,&
881-
SHORT_NAME = 'TSOIL2TILE' ,&
881+
SHORT_NAME = 'TP2' ,&
882882
DIMS = MAPL_DimsTileOnly ,&
883883
VLOCATION = MAPL_VLocationNone ,&
884884
RC=STATUS )
@@ -887,7 +887,7 @@ subroutine SetServices(gc, rc)
887887
call MAPL_AddExportSpec(GC, &
888888
LONG_NAME = 'soil_temperature_layer_3' ,&
889889
UNITS = 'K' ,&
890-
SHORT_NAME = 'TSOIL3TILE' ,&
890+
SHORT_NAME = 'TP3' ,&
891891
DIMS = MAPL_DimsTileOnly ,&
892892
VLOCATION = MAPL_VLocationNone ,&
893893
RC=STATUS )
@@ -896,7 +896,7 @@ subroutine SetServices(gc, rc)
896896
call MAPL_AddExportSpec(GC, &
897897
LONG_NAME = 'soil_temperature_layer_4' ,&
898898
UNITS = 'K' ,&
899-
SHORT_NAME = 'TSOIL4TILE' ,&
899+
SHORT_NAME = 'TP4' ,&
900900
DIMS = MAPL_DimsTileOnly ,&
901901
VLOCATION = MAPL_VLocationNone ,&
902902
RC=STATUS )
@@ -905,7 +905,7 @@ subroutine SetServices(gc, rc)
905905
call MAPL_AddExportSpec(GC, &
906906
LONG_NAME = 'soil_temperature_layer_5' ,&
907907
UNITS = 'K' ,&
908-
SHORT_NAME = 'TSOIL5TILE' ,&
908+
SHORT_NAME = 'TP5' ,&
909909
DIMS = MAPL_DimsTileOnly ,&
910910
VLOCATION = MAPL_VLocationNone ,&
911911
RC=STATUS )
@@ -914,7 +914,7 @@ subroutine SetServices(gc, rc)
914914
call MAPL_AddExportSpec(GC, &
915915
LONG_NAME = 'soil_temperature_layer_6' ,&
916916
UNITS = 'K' ,&
917-
SHORT_NAME = 'TSOIL6TILE' ,&
917+
SHORT_NAME = 'TP6' ,&
918918
DIMS = MAPL_DimsTileOnly ,&
919919
VLOCATION = MAPL_VLocationNone ,&
920920
RC=STATUS )
@@ -2966,19 +2966,19 @@ subroutine Collect_land_ens(gc, import, export, clock, rc)
29662966
VERIFY_(status)
29672967
call MAPL_GetPointer(export, WCPR_enstd, 'WCPR_ENSSTD' ,rc=status)
29682968
VERIFY_(status)
2969-
call MAPL_GetPointer(export, TP1_enavg, 'TSOIL1TILE' ,rc=status)
2969+
call MAPL_GetPointer(export, TP1_enavg, 'TP1' ,rc=status)
29702970
VERIFY_(status)
2971-
call MAPL_GetPointer(export, TP1_enstd, 'TSOIL1TILE_ENSSTD' ,rc=status)
2971+
call MAPL_GetPointer(export, TP1_enstd, 'TP1_ENSSTD' ,rc=status)
29722972
VERIFY_(status)
2973-
call MAPL_GetPointer(export, TP2_enavg, 'TSOIL2TILE' ,rc=status)
2973+
call MAPL_GetPointer(export, TP2_enavg, 'TP2' ,rc=status)
29742974
VERIFY_(status)
2975-
call MAPL_GetPointer(export, TP3_enavg, 'TSOIL3TILE' ,rc=status)
2975+
call MAPL_GetPointer(export, TP3_enavg, 'TP3' ,rc=status)
29762976
VERIFY_(status)
2977-
call MAPL_GetPointer(export, TP4_enavg, 'TSOIL4TILE' ,rc=status)
2977+
call MAPL_GetPointer(export, TP4_enavg, 'TP4' ,rc=status)
29782978
VERIFY_(status)
2979-
call MAPL_GetPointer(export, TP5_enavg, 'TSOIL5TILE' ,rc=status)
2979+
call MAPL_GetPointer(export, TP5_enavg, 'TP5' ,rc=status)
29802980
VERIFY_(status)
2981-
call MAPL_GetPointer(export, TP6_enavg, 'TSOIL6TILE' ,rc=status)
2981+
call MAPL_GetPointer(export, TP6_enavg, 'TP6' ,rc=status)
29822982
VERIFY_(status)
29832983
call MAPL_GetPointer(export, EMIS_enavg, 'EMIS' ,rc=status)
29842984
VERIFY_(status)

‎GEOSlandassim_GridComp/GEOS_LandAssimGridComp.F90‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ subroutine SetServices ( GC, RC )
849849
call MAPL_AddExportSpec(GC ,&
850850
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 )
@@ -858,7 +858,7 @@ subroutine SetServices ( GC, RC )
858858
call MAPL_AddExportSpec(GC ,&
859859
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

‎GEOSldas_App/GEOSldas_HIST.rc‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@ COLLECTIONS:
385385
'WET2' , 'ENSAVG' , 'sm_rootzone_wetness' ,
386386
'WET3' , 'ENSAVG' , 'sm_profile_wetness' ,
387387
'TPSURF' , 'ENSAVG' , 'surface_temp' ,
388-
'TSOIL1TILE' , 'ENSAVG' , 'soil_temp_layer1' ,
389-
'TSOIL2TILE' , 'ENSAVG' , 'soil_temp_layer2' ,
390-
'TSOIL3TILE' , 'ENSAVG' , 'soil_temp_layer3' ,
391-
'TSOIL4TILE' , 'ENSAVG' , 'soil_temp_layer4' ,
392-
'TSOIL5TILE' , 'ENSAVG' , 'soil_temp_layer5' ,
393-
'TSOIL6TILE' , 'ENSAVG' , 'soil_temp_layer6' ,
388+
'TP1' , 'ENSAVG' , 'soil_temp_layer1' ,
389+
'TP2' , 'ENSAVG' , 'soil_temp_layer2' ,
390+
'TP3' , 'ENSAVG' , 'soil_temp_layer3' ,
391+
'TP4' , 'ENSAVG' , 'soil_temp_layer4' ,
392+
'TP5' , 'ENSAVG' , 'soil_temp_layer5' ,
393+
'TP6' , 'ENSAVG' , 'soil_temp_layer6' ,
394394
'SNOWMASS' , 'ENSAVG' , 'snow_mass' ,
395395
'SNOWDP' , 'ENSAVG' , 'snow_depth' ,
396396
'EVLAND' , 'ENSAVG' , 'land_evapotranspiration_flux' ,
@@ -430,7 +430,7 @@ COLLECTIONS:
430430
inst1_1d_lnr_Nt.frequency: 010000 ,
431431
inst1_1d_lnr_Nt.ref_time: 000000,
432432
inst1_1d_lnr_Nt.fields: 'TPSURF' , 'ENSAVG' , 'surface_temp' ,
433-
'TSOIL1TILE' , 'ENSAVG' , 'soil_temp_layer1' ,
433+
'TP1' , 'ENSAVG' , 'soil_temp_layer1' ,
434434
'TPSNOW' , 'ENSAVG' , 'snow_temp_layer1' ,
435435
'TB_LAND_1410MHZ_40DEG_HPOL' , 'LANDASSIM' , 'tb_h' ,
436436
'TB_LAND_1410MHZ_40DEG_VPOL' , 'LANDASSIM' , 'tb_v' ,
@@ -487,22 +487,22 @@ COLLECTIONS:
487487
'WCRZ' , 'ENSAVG' , 'RZMC_FCST' ,
488488
'WCPR' , 'ENSAVG' , 'PRMC_FCST' ,
489489
'TPSURF' , 'ENSAVG' , 'TSURF_FCST' ,
490-
'TSOIL1TILE' , 'ENSAVG' , 'TSOIL1_FCST' ,
490+
'TP1' , 'ENSAVG' , 'TSOIL1_FCST' ,
491491
'WCSF_ENSSTD' , 'ENSAVG' , 'SFMC_FCST_ENSSTD' ,
492492
'WCRZ_ENSSTD' , 'ENSAVG' , 'RZMC_FCST_ENSSTD' ,
493493
'WCPR_ENSSTD' , 'ENSAVG' , 'PRMC_FCST_ENSSTD' ,
494494
'TPSURF_ENSSTD' , 'ENSAVG' , 'TSURF_FCST_ENSSTD' ,
495-
'TSOIL1TILE_ENSSTD' , 'ENSAVG' , 'TSOIL1_FCST_ENSSTD' ,
495+
'TP1_ENSSTD' , 'ENSAVG' , 'TSOIL1_FCST_ENSSTD' ,
496496
'WCSF_ANA' , 'LANDASSIM' , 'SFMC_ANA' ,
497497
'WCRZ_ANA' , 'LANDASSIM' , 'RZMC_ANA' ,
498498
'WCPR_ANA' , 'LANDASSIM' , 'PRMC_ANA' ,
499499
'TPSURF_ANA' , 'LANDASSIM' , 'TSURF_ANA' ,
500-
'TSOIL1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
500+
'TP1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
501501
'WCSF_ANA_ENSSTD' , 'LANDASSIM' , 'SFMC_ANA_ENSSTD' ,
502502
'WCRZ_ANA_ENSSTD' , 'LANDASSIM' , 'RZMC_ANA_ENSSTD' ,
503503
'WCPR_ANA_ENSSTD' , 'LANDASSIM' , 'PRMC_ANA_ENSSTD' ,
504504
'TPSURF_ANA_ENSSTD' , 'LANDASSIM' , 'TSURF_ANA_ENSSTD' ,
505-
'TSOIL1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
505+
'TP1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
506506
::
507507

508508
# For lndfcstana, *.frequency and *.ref_time must be consistent with the LDAS.rc resource
@@ -526,22 +526,22 @@ COLLECTIONS:
526526
'WCRZ' , 'ENSAVG' , 'RZMC_FCST' ,
527527
'WCPR' , 'ENSAVG' , 'PRMC_FCST' ,
528528
'TPSURF' , 'ENSAVG' , 'TSURF_FCST' ,
529-
'TSOIL1TILE' , 'ENSAVG' , 'TSOIL1_FCST' ,
529+
'TP1' , 'ENSAVG' , 'TSOIL1_FCST' ,
530530
'WCSF_ENSSTD' , 'ENSAVG' , 'SFMC_FCST_ENSSTD' ,
531531
'WCRZ_ENSSTD' , 'ENSAVG' , 'RZMC_FCST_ENSSTD' ,
532532
'WCPR_ENSSTD' , 'ENSAVG' , 'PRMC_FCST_ENSSTD' ,
533533
'TPSURF_ENSSTD' , 'ENSAVG' , 'TSURF_FCST_ENSSTD' ,
534-
'TSOIL1TILE_ENSSTD' , 'ENSAVG' , 'TSOIL1_FCST_ENSSTD' ,
534+
'TP1_ENSSTD' , 'ENSAVG' , 'TSOIL1_FCST_ENSSTD' ,
535535
'WCSF_ANA' , 'LANDASSIM' , 'SFMC_ANA' ,
536536
'WCRZ_ANA' , 'LANDASSIM' , 'RZMC_ANA' ,
537537
'WCPR_ANA' , 'LANDASSIM' , 'PRMC_ANA' ,
538538
'TPSURF_ANA' , 'LANDASSIM' , 'TSURF_ANA' ,
539-
'TSOIL1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
539+
'TP1_ANA' , 'LANDASSIM' , 'TSOIL1_ANA' ,
540540
'WCSF_ANA_ENSSTD' , 'LANDASSIM' , 'SFMC_ANA_ENSSTD' ,
541541
'WCRZ_ANA_ENSSTD' , 'LANDASSIM' , 'RZMC_ANA_ENSSTD' ,
542542
'WCPR_ANA_ENSSTD' , 'LANDASSIM' , 'PRMC_ANA_ENSSTD' ,
543543
'TPSURF_ANA_ENSSTD' , 'LANDASSIM' , 'TSURF_ANA_ENSSTD' ,
544-
'TSOIL1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
544+
'TP1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
545545
::
546546

547547
# ========================== EOF ==============================================================

‎GEOSldas_App/process_hist.csh‎

100755100644
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ endif
5454
if($NENS > 1) then
5555
set GridComp = ENSAVG
5656
sed -i 's|VEGDYN|'VEGDYN_e0000'|g' $HISTRC
57-
sed -i 's|TP1|'TSOIL1TILE'|g' $HISTRC
58-
sed -i 's|TP2|'TSOIL2TILE'|g' $HISTRC
59-
sed -i 's|TP3|'TSOIL3TILE'|g' $HISTRC
60-
sed -i 's|TP4|'TSOIL4TILE'|g' $HISTRC
61-
sed -i 's|TP5|'TSOIL5TILE'|g' $HISTRC
62-
sed -i 's|TP6|'TSOIL6TILE'|g' $HISTRC
57+
# sed -i 's|TP1|'TSOIL1TILE'|g' $HISTRC
58+
# sed -i 's|TP2|'TSOIL2TILE'|g' $HISTRC
59+
# sed -i 's|TP3|'TSOIL3TILE'|g' $HISTRC
60+
# sed -i 's|TP4|'TSOIL4TILE'|g' $HISTRC
61+
# sed -i 's|TP5|'TSOIL5TILE'|g' $HISTRC
62+
# sed -i 's|TP6|'TSOIL6TILE'|g' $HISTRC
6363
# sed -i 's|DATAATM|'DATAATM0000'|g' $HISTRC
6464
endif
6565

0 commit comments

Comments
 (0)