Skip to content

Commit ab012ed

Browse files
gmao-rreichlegmao-rreichle
committed
corrected LONG_NAME attributes, comments, units for multi-day exponential moving averages (GEOS_CatchCNCLM51GridComp.F90)
1 parent 52c3800 commit ab012ed

File tree

1 file changed

+23
-23
lines changed
  • GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM51_GridComp

1 file changed

+23
-23
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM51_GridComp/GEOS_CatchCNCLM51GridComp.F90‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,7 @@ subroutine SetServices ( GC, RC )
18741874
VERIFY_(STATUS)
18751875

18761876
call MAPL_AddInternalSpec(GC ,&
1877-
LONG_NAME = '5-day running mean of CN sum for snow depth',&
1877+
LONG_NAME = '5-day_exp_moving_avg_of_CN_sum_for_snow_depth',&
18781878
UNITS = 'm' ,&
18791879
SHORT_NAME = 'SNDZM5D' ,&
18801880
DIMS = MAPL_DimsTileOnly ,&
@@ -1894,7 +1894,7 @@ subroutine SetServices ( GC, RC )
18941894
VERIFY_(STATUS)
18951895

18961896
call MAPL_AddInternalSpec(GC ,&
1897-
LONG_NAME = '10-day running mean of 2-m temperature',&
1897+
LONG_NAME = '10-day_exp_moving_avg_of_surface_air_temperature',&
18981898
UNITS = 'K' ,&
18991899
SHORT_NAME = 'T2M10D' ,&
19001900
DIMS = MAPL_DimsTileOnly ,&
@@ -1904,7 +1904,7 @@ subroutine SetServices ( GC, RC )
19041904
VERIFY_(STATUS)
19051905

19061906
call MAPL_AddInternalSpec(GC ,&
1907-
LONG_NAME = '10-day running mean of surface layer soil temperature',&
1907+
LONG_NAME = '10-day_exp_moving_avg_of_surface_layer_soil_temperature',&
19081908
UNITS = 'K' ,&
19091909
SHORT_NAME = 'TG10D' ,&
19101910
DIMS = MAPL_DimsTileOnly ,&
@@ -1914,7 +1914,7 @@ subroutine SetServices ( GC, RC )
19141914
VERIFY_(STATUS)
19151915

19161916
call MAPL_AddInternalSpec(GC ,&
1917-
LONG_NAME = '5-day running mean of daily minimum 2-m temperature',&
1917+
LONG_NAME = '5-day_exp_moving_avg_of_daily_minimum_surface_air_temperature',&
19181918
UNITS = 'K' ,&
19191919
SHORT_NAME = 'T2MMIN5D' ,&
19201920
DIMS = MAPL_DimsTileOnly ,&
@@ -1924,7 +1924,7 @@ subroutine SetServices ( GC, RC )
19241924
VERIFY_(STATUS)
19251925

19261926
call MAPL_AddInternalSpec(GC ,&
1927-
LONG_NAME = '30-day running mean of surface relative humidity',&
1927+
LONG_NAME = '30-day_exp_moving_avg_of_surface_relative_humidity',&
19281928
UNITS = '%' ,&
19291929
SHORT_NAME = 'RH30D' ,&
19301930
DIMS = MAPL_DimsTileOnly ,&
@@ -1935,8 +1935,8 @@ subroutine SetServices ( GC, RC )
19351935

19361936

19371937
call MAPL_AddInternalSpec(GC ,&
1938-
LONG_NAME = '10-day running mean of total precipitation',&
1939-
UNITS = 'mm H2O/s' ,&
1938+
LONG_NAME = '10-day_exp_moving_avg_of_total precipitation',&
1939+
UNITS = 'kg m-2 s-1' ,&
19401940
SHORT_NAME = 'TPREC10D' ,&
19411941
DIMS = MAPL_DimsTileOnly ,&
19421942
VLOCATION = MAPL_VLocationNone ,&
@@ -1945,8 +1945,8 @@ subroutine SetServices ( GC, RC )
19451945
VERIFY_(STATUS)
19461946

19471947
call MAPL_AddInternalSpec(GC ,&
1948-
LONG_NAME = '60-day running mean of total precipitation',&
1949-
UNITS = 'mm H2O/s' ,&
1948+
LONG_NAME = '60-day_exp_moving_avg_of_total_precipitation',&
1949+
UNITS = 'kg m-2 s-1' ,&
19501950
SHORT_NAME = 'TPREC60D' ,&
19511951
DIMS = MAPL_DimsTileOnly ,&
19521952
VLOCATION = MAPL_VLocationNone ,&
@@ -1955,7 +1955,7 @@ subroutine SetServices ( GC, RC )
19551955
VERIFY_(STATUS)
19561956

19571957
call MAPL_AddInternalSpec(GC ,&
1958-
LONG_NAME = '365-day running mean of total ET',&
1958+
LONG_NAME = '365-day_exp_moving_avg_of_total_evapotranspiration',&
19591959
UNITS = 'W m-2' ,&
19601960
SHORT_NAME = 'ET365D' ,&
19611961
DIMS = MAPL_DimsTileOnly ,&
@@ -6007,7 +6007,7 @@ subroutine Driver ( RC )
60076007
istep = maxval((/n10d,n30d,n60d/)) ! otherwise, set model time step index to the maximum of these nXX
60086008
end if
60096009

6010-
! jkolassa: implement this separately for 365-day running mean of ET
6010+
! jkolassa: implement this separately for 365-day exponential moving average of ET
60116011
if(init_accum_365) then
60126012
istep_365 = 0 ! set model time step index to 0 when begin to accumulate the cumulative variables, fzeng, 21 Apr 2017
60136013
else
@@ -7134,27 +7134,27 @@ subroutine Driver ( RC )
71347134
! ---------------------------------------------------------------------------------
71357135
if(init_accum) then
71367136

7137-
! (1) 5-day running mean of snow depth
7137+
! (1) 5-day exponential moving average of snow depth
71387138
accper = min(istep,n5d)
71397139
SNDZM5D = ((accper-1)*SNDZM5D + SNDZM) / accper
71407140

7141-
! (1) 10-day running mean of 2-m temperature (K) and total precipitation (mm H2O/s)
7141+
! (1) 10-day exponential moving average of 2-m temperature (K) and total precipitation (mm H2O/s)
71427142
accper = min(istep,n10d)
71437143
T2M10D = ((accper-1)*T2M10D + TA) / accper
71447144
TPREC10D = ((accper-1)*TPREC10D + PCU + PLS + SNO) / accper
71457145
TG10D = ((accper-1)*TG10D + TG(:,1)) / accper
71467146

7147-
! (2) 30-day running mean of relative humidity [%]
7147+
! (2) 30-day exponential moving average of relative humidity [%]
71487148
accper = min(istep,n30d)
71497149
RH30D = ((accper-1)*RH30D + Qair_relative) / accper
71507150

71517151

7152-
! (2) 60-day running mean of total precipitation (mm H2O/s)
7152+
! (2) 60-day exponential moving average of total precipitation (mm H2O/s)
71537153
accper = min(istep,n60d)
71547154
TPREC60D = ((accper-1)*TPREC60D + PCU + PLS + SNO) / accper
71557155

71567156

7157-
! jkolassa: for T2MMIN5D compute minimum T2M once per day, then use that value to compute new 5-day running mean of minimum T2M
7157+
! jkolassa: for T2MMIN5D compute minimum T2M once per day, then use that value to compute new 5-day exponential moving average of minimum T2M
71587158

71597159
do n = 1,ntiles
71607160
ta_count(n) = ta_count(n) + 1
@@ -7169,15 +7169,15 @@ subroutine Driver ( RC )
71697169

71707170
else
71717171

7172-
SNDZM5D = ((n5d-1)*SNDZM5D + SNDZM) / n5d
7173-
T2M10D = ((n10d-1)*T2M10D + TA) / n10d
7174-
TG10D = ((n10d-1)*TG10D + TG(:,1)) / n10d
7172+
SNDZM5D = (( n5d-1)*SNDZM5D + SNDZM ) / n5d
7173+
T2M10D = ((n10d-1)*T2M10D + TA ) / n10d
7174+
TG10D = ((n10d-1)*TG10D + TG(:,1) ) / n10d
71757175
TPREC10D = ((n10d-1)*TPREC10D + PCU + PLS + SNO) / n10d
7176-
RH30D = ((n30d-1)*RH30D + Qair_relative) / n30d
7176+
RH30D = ((n30d-1)*RH30D + Qair_relative ) / n30d
71777177
TPREC60D = ((n60d-1)*TPREC60D + PCU + PLS + SNO) / n60d
71787178

71797179

7180-
! jkolassa: for T2MMIN5D compute minimum T2M once per day, then use that value to compute new 5-day running mean of minimum T2M
7180+
! jkolassa: for T2MMIN5D compute minimum T2M once per day, then use that value to compute new 5-day exponential moving average of minimum T2M
71817181

71827182
do n = 1,ntiles
71837183
ta_count(n) = ta_count(n) + 1
@@ -8112,9 +8112,9 @@ subroutine Driver ( RC )
81128112

81138113
end if
81148114

8115-
! compute 365-day running mean of total ET (excluding sublimation from snow)
8115+
! compute 365-day exponential moving average of total ET (excluding sublimation from snow)
81168116
if(init_accum_365) then
8117-
! 365-day running mean of total ET (W m-2)
8117+
! 365-day exponential moving average of total ET (W m-2)
81188118
accper = min(istep_365,n365d)
81198119
ET365D = ((accper-1)*ET365D + EVPSOI + EVPINT + EVPVEG) / accper
81208120
else

0 commit comments

Comments
 (0)