Skip to content

Commit 18cb3ca

Browse files
sdrabenhsdrabenh
authored
Merge pull request #1032 from GEOS-ESM/feature/rreichle/update_exports_to_M21C_filespecs
update LONG_NAME attributes to match M21C file specs; conservative regridding of (obs) PRECIP_FILE inputs
2 parents 96a8a26 + fc85026 commit 18cb3ca

File tree

14 files changed

+229
-194
lines changed

14 files changed

+229
-194
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90‎

Lines changed: 81 additions & 46 deletions
Large diffs are not rendered by default.

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp/GEOS_LakeGridComp.F90‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ subroutine SetServices ( GC, RC )
137137
VERIFY_(STATUS)
138138

139139
call MAPL_AddExportSpec(GC, &
140-
LONG_NAME = 'surface_albedo_for_visible_beam', &
140+
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
141141
UNITS = '1', &
142142
SHORT_NAME = 'ALBVR', &
143143
DIMS = MAPL_DimsTileOnly, &
@@ -146,7 +146,7 @@ subroutine SetServices ( GC, RC )
146146
VERIFY_(STATUS)
147147

148148
call MAPL_AddExportSpec(GC, &
149-
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
149+
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
150150
UNITS = '1', &
151151
SHORT_NAME = 'ALBVF', &
152152
DIMS = MAPL_DimsTileOnly, &
@@ -155,7 +155,7 @@ subroutine SetServices ( GC, RC )
155155
VERIFY_(STATUS)
156156

157157
call MAPL_AddExportSpec(GC, &
158-
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
158+
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
159159
UNITS = '1', &
160160
SHORT_NAME = 'ALBNR', &
161161
DIMS = MAPL_DimsTileOnly, &
@@ -164,7 +164,7 @@ subroutine SetServices ( GC, RC )
164164
VERIFY_(STATUS)
165165

166166
call MAPL_AddExportSpec(GC, &
167-
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
167+
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
168168
UNITS = '1', &
169169
SHORT_NAME = 'ALBNF', &
170170
DIMS = MAPL_DimsTileOnly, &
@@ -192,7 +192,7 @@ subroutine SetServices ( GC, RC )
192192
VERIFY_(STATUS)
193193

194194
call MAPL_AddExportSpec(GC, &
195-
LONG_NAME = 'runoff_flux',&
195+
LONG_NAME = 'runoff_total_flux' ,&
196196
UNITS = 'kg m-2 s-1' ,&
197197
SHORT_NAME = 'RUNOFF' ,&
198198
DIMS = MAPL_DimsTileOnly ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ subroutine SetServices ( GC, RC )
245245
VERIFY_(STATUS)
246246

247247
call MAPL_AddImportSpec(GC ,&
248-
LONG_NAME = 'surface_downwelling_par_beam_flux',&
248+
LONG_NAME = 'surface_downwelling_PAR_beam_flux',&
249249
UNITS = 'W m-2' ,&
250250
SHORT_NAME = 'DRPAR' ,&
251251
DIMS = MAPL_DimsTileOnly ,&
@@ -254,7 +254,7 @@ subroutine SetServices ( GC, RC )
254254
VERIFY_(STATUS)
255255

256256
call MAPL_AddImportSpec(GC ,&
257-
LONG_NAME = 'surface_downwelling_par_diffuse_flux',&
257+
LONG_NAME = 'surface_downwelling_PAR_diffuse_flux',&
258258
UNITS = 'W m-2' ,&
259259
SHORT_NAME = 'DFPAR' ,&
260260
DIMS = MAPL_DimsTileOnly ,&
@@ -346,7 +346,7 @@ subroutine SetServices ( GC, RC )
346346
VERIFY_(STATUS)
347347

348348
call MAPL_AddImportSpec(GC ,&
349-
LONG_NAME = 'greeness_fraction' ,&
349+
LONG_NAME = 'vegetation_greenness_fraction',&
350350
UNITS = '1' ,&
351351
SHORT_NAME = 'GRN' ,&
352352
DIMS = MAPL_DimsTileOnly ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90‎

Lines changed: 45 additions & 45 deletions
Large diffs are not rendered by default.

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90‎

Lines changed: 47 additions & 47 deletions
Large diffs are not rendered by default.

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOSroute_GridComp/GEOS_RouteGridComp.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ subroutine SetServices ( GC, RC )
178178
! -----------------------------------------------------------
179179

180180
call MAPL_AddImportSpec(GC, &
181-
LONG_NAME = 'runoff_flux' ,&
181+
LONG_NAME = 'runoff_total_flux' ,&
182182
UNITS = 'kg m-2 s-1' ,&
183183
SHORT_NAME = 'RUNOFF' ,&
184184
DIMS = MAPL_DimsTileOnly ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOSvegdyn_GridComp/GEOS_VegdynGridComp.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ subroutine SetServices ( GC, RC )
217217

218218
call MAPL_AddExportSpec(GC ,&
219219
SHORT_NAME = 'GRN' ,&
220-
LONG_NAME = 'greeness_fraction' ,&
220+
LONG_NAME = 'vegetation_greenness_fraction' ,&
221221
UNITS = '1' ,&
222222
DIMS = MAPL_DimsTileOnly ,&
223223
VLOCATION = MAPL_VLocationNone ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ subroutine SetServices ( GC, RC )
198198
VERIFY_(STATUS)
199199

200200
call MAPL_AddExportSpec(GC, &
201-
LONG_NAME = 'surface_albedo_for_visible_beam', &
201+
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
202202
UNITS = '1', &
203203
SHORT_NAME = 'ALBVR', &
204204
DIMS = MAPL_DimsTileOnly, &
@@ -207,7 +207,7 @@ subroutine SetServices ( GC, RC )
207207
VERIFY_(STATUS)
208208

209209
call MAPL_AddExportSpec(GC, &
210-
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
210+
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
211211
UNITS = '1', &
212212
SHORT_NAME = 'ALBVF', &
213213
DIMS = MAPL_DimsTileOnly, &
@@ -216,7 +216,7 @@ subroutine SetServices ( GC, RC )
216216
VERIFY_(STATUS)
217217

218218
call MAPL_AddExportSpec(GC, &
219-
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
219+
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
220220
UNITS = '1', &
221221
SHORT_NAME = 'ALBNR', &
222222
DIMS = MAPL_DimsTileOnly, &
@@ -225,7 +225,7 @@ subroutine SetServices ( GC, RC )
225225
VERIFY_(STATUS)
226226

227227
call MAPL_AddExportSpec(GC, &
228-
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
228+
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
229229
UNITS = '1', &
230230
SHORT_NAME = 'ALBNF', &
231231
DIMS = MAPL_DimsTileOnly, &
@@ -235,7 +235,7 @@ subroutine SetServices ( GC, RC )
235235

236236
call MAPL_AddExportSpec(GC, &
237237
SHORT_NAME = 'TST', &
238-
LONG_NAME = 'surface_skin_temperature', &
238+
LONG_NAME = 'surface_temperature', &
239239
UNITS = 'K', &
240240
DIMS = MAPL_DimsTileOnly, &
241241
VLOCATION = MAPL_VLocationNone, &
@@ -397,7 +397,7 @@ subroutine SetServices ( GC, RC )
397397
VERIFY_(STATUS)
398398

399399
call MAPL_AddExportSpec(GC, &
400-
LONG_NAME = 'fractional_area_of_glaciated_surface_snowcover',&
400+
LONG_NAME = 'fractional_snow_covered_area_of_glaciated_surface',&
401401
UNITS = '1' ,&
402402
SHORT_NAME = 'ASNOW_GL' ,&
403403
DIMS = MAPL_DimsTileOnly ,&
@@ -485,7 +485,7 @@ subroutine SetServices ( GC, RC )
485485
VERIFY_(STATUS)
486486

487487
call MAPL_AddExportSpec(GC, &
488-
LONG_NAME = 'top_snow_layer_mass_change_due_to_sub_con', &
488+
LONG_NAME = 'top_snow_layer_mass_change_due_to_sublimation_and_condensation', &
489489
UNITS = 'kg m-2 s-1' ,&
490490
SHORT_NAME = 'WESNSC' ,&
491491
DIMS = MAPL_DimsTileOnly ,&
@@ -569,7 +569,7 @@ subroutine SetServices ( GC, RC )
569569
VERIFY_(STATUS)
570570

571571
call MAPL_AddExportSpec(GC, &
572-
LONG_NAME = 'contribution_to_smb_from_refreezed_rain_over_bare_ice', &
572+
LONG_NAME = 'contribution_to_surface_mass_balance_from_rain_frozen_onto_bare_ice', &
573573
UNITS = 'kg m-2 s-1' ,&
574574
SHORT_NAME = 'RAINRFZ' ,&
575575
DIMS = MAPL_DimsTileOnly ,&
@@ -578,7 +578,7 @@ subroutine SetServices ( GC, RC )
578578
VERIFY_(STATUS)
579579

580580
call MAPL_AddExportSpec(GC, &
581-
LONG_NAME = 'snowmelt_flux' ,&
581+
LONG_NAME = 'snow_melt_flux' ,&
582582
UNITS = 'kg m-2 s-1' ,&
583583
SHORT_NAME = 'SMELT' ,&
584584
DIMS = MAPL_DimsTileOnly ,&
@@ -587,7 +587,7 @@ subroutine SetServices ( GC, RC )
587587
VERIFY_(STATUS)
588588

589589
call MAPL_AddExportSpec(GC, &
590-
LONG_NAME = 'icemelt_flux' ,&
590+
LONG_NAME = 'ice_melt_flux' ,&
591591
UNITS = 'kg m-2 s-1' ,&
592592
SHORT_NAME = 'IMELT' ,&
593593
DIMS = MAPL_DimsTileOnly ,&
@@ -596,7 +596,7 @@ subroutine SetServices ( GC, RC )
596596
VERIFY_(STATUS)
597597

598598
call MAPL_AddExportSpec(GC, &
599-
LONG_NAME = 'snow_broadband_albedo', &
599+
LONG_NAME = 'snow_broadband_reflectivity', &
600600
UNITS = '1' ,&
601601
SHORT_NAME = 'SNOWALB' ,&
602602
DIMS = MAPL_DimsTileOnly ,&
@@ -605,7 +605,7 @@ subroutine SetServices ( GC, RC )
605605
VERIFY_(STATUS)
606606

607607
call MAPL_AddExportSpec(GC, &
608-
LONG_NAME = 'aggregated_snow_ice_broadband_albedo', &
608+
LONG_NAME = 'aggregated_snow_ice_broadband_reflectivity', &
609609
UNITS = '1' ,&
610610
SHORT_NAME = 'SNICEALB' ,&
611611
DIMS = MAPL_DimsTileOnly ,&
@@ -623,7 +623,7 @@ subroutine SetServices ( GC, RC )
623623
VERIFY_(STATUS)
624624

625625
call MAPL_AddExportSpec(GC, &
626-
LONG_NAME = 'melt_water_content', &
626+
LONG_NAME = 'snowpack_meltwater_content', &
627627
UNITS = 'kg m-2' ,&
628628
SHORT_NAME = 'MELTWTRCONT' ,&
629629
DIMS = MAPL_DimsTileOnly ,&
@@ -641,7 +641,7 @@ subroutine SetServices ( GC, RC )
641641
VERIFY_(STATUS)
642642

643643
call MAPL_AddExportSpec(GC, &
644-
LONG_NAME = 'runoff_flux' ,&
644+
LONG_NAME = 'runoff_total_flux' ,&
645645
UNITS = 'kg m-2 s-1' ,&
646646
SHORT_NAME = 'RUNOFF' ,&
647647
DIMS = MAPL_DimsTileOnly ,&
@@ -848,7 +848,7 @@ subroutine SetServices ( GC, RC )
848848
VERIFY_(STATUS)
849849

850850
call MAPL_AddExportSpec(GC, &
851-
LONG_NAME = 'Ground_heating_for_tskin' ,&
851+
LONG_NAME = 'glacier_ice_heating_flux' ,&
852852
UNITS = 'W m-2' ,&
853853
SHORT_NAME = 'GHTSKIN' ,&
854854
DIMS = MAPL_DimsTileOnly ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp.F90‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,31 +181,31 @@ subroutine SetServices ( GC, RC )
181181
_RC )
182182

183183
call MAPL_AddExportSpec(GC, &
184-
LONG_NAME = 'surface_albedo_for_visible_beam', &
184+
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
185185
UNITS = '1', &
186186
SHORT_NAME = 'ALBVR', &
187187
DIMS = MAPL_DimsTileOnly, &
188188
VLOCATION = MAPL_VLocationNone, &
189189
_RC )
190190

191191
call MAPL_AddExportSpec(GC, &
192-
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
192+
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
193193
UNITS = '1', &
194194
SHORT_NAME = 'ALBVF', &
195195
DIMS = MAPL_DimsTileOnly, &
196196
VLOCATION = MAPL_VLocationNone, &
197197
_RC )
198198

199199
call MAPL_AddExportSpec(GC, &
200-
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
200+
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
201201
UNITS = '1', &
202202
SHORT_NAME = 'ALBNR', &
203203
DIMS = MAPL_DimsTileOnly, &
204204
VLOCATION = MAPL_VLocationNone, &
205205
_RC )
206206

207207
call MAPL_AddExportSpec(GC, &
208-
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
208+
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
209209
UNITS = '1', &
210210
SHORT_NAME = 'ALBNF', &
211211
DIMS = MAPL_DimsTileOnly, &
@@ -1266,7 +1266,7 @@ subroutine SetServices ( GC, RC )
12661266

12671267
call MAPL_AddExportSpec(GC, &
12681268
SHORT_NAME = 'SIALB' ,&
1269-
LONG_NAME = 'broad_band_sea_ice_albedo' ,&
1269+
LONG_NAME = 'broad_band_sea_ice_reflectivity' ,&
12701270
UNITS = '1' ,&
12711271
DIMS = MAPL_DimsTileOnly ,&
12721272
VLOCATION = MAPL_VLocationNone ,&
@@ -1388,7 +1388,7 @@ subroutine SetServices ( GC, RC )
13881388

13891389
call MAPL_AddExportSpec(GC, &
13901390
SHORT_NAME = 'ialb_CMIP5' ,&
1391-
LONG_NAME = 'bare_sea_ice_albedo' ,&
1391+
LONG_NAME = 'bare_sea_ice_reflectivity' ,&
13921392
UNITS = '1' ,&
13931393
DIMS = MAPL_DimsTileOnly ,&
13941394
VLOCATION = MAPL_VLocationNone ,&
@@ -1527,7 +1527,7 @@ subroutine SetServices ( GC, RC )
15271527

15281528
call MAPL_AddExportSpec(GC, &
15291529
SHORT_NAME = 'ALBIN' ,&
1530-
LONG_NAME = 'ice_surface_albedo_over_ice_categories' ,&
1530+
LONG_NAME = 'ice_surface_reflectivity_over_ice_categories' ,&
15311531
UNITS = '1' ,&
15321532
DIMS = MAPL_DimsTileOnly ,&
15331533
UNGRIDDED_DIMS = (/NUM_ICE_CATEGORIES/) ,&
@@ -1536,7 +1536,7 @@ subroutine SetServices ( GC, RC )
15361536

15371537
call MAPL_AddExportSpec(GC, &
15381538
SHORT_NAME = 'ALBSN' ,&
1539-
LONG_NAME = 'snow_surface_albedo_over_ice_categories' ,&
1539+
LONG_NAME = 'snow_surface_reflectivity_over_ice_categories' ,&
15401540
UNITS = '1' ,&
15411541
DIMS = MAPL_DimsTileOnly ,&
15421542
UNGRIDDED_DIMS = (/NUM_ICE_CATEGORIES/) ,&

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_OpenWaterGridComp.F90‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,31 +192,31 @@ subroutine SetServices ( GC, RC )
192192
_RC)
193193

194194
call MAPL_AddExportSpec(GC, &
195-
LONG_NAME = 'surface_albedo_for_visible_beam', &
195+
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
196196
UNITS = '1', &
197197
SHORT_NAME = 'ALBVR', &
198198
DIMS = MAPL_DimsTileOnly, &
199199
VLOCATION = MAPL_VLocationNone, &
200200
_RC)
201201

202202
call MAPL_AddExportSpec(GC, &
203-
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
203+
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
204204
UNITS = '1', &
205205
SHORT_NAME = 'ALBVF', &
206206
DIMS = MAPL_DimsTileOnly, &
207207
VLOCATION = MAPL_VLocationNone, &
208208
_RC)
209209

210210
call MAPL_AddExportSpec(GC, &
211-
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
211+
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
212212
UNITS = '1', &
213213
SHORT_NAME = 'ALBNR', &
214214
DIMS = MAPL_DimsTileOnly, &
215215
VLOCATION = MAPL_VLocationNone, &
216216
_RC)
217217

218218
call MAPL_AddExportSpec(GC, &
219-
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
219+
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
220220
UNITS = '1', &
221221
SHORT_NAME = 'ALBNF', &
222222
DIMS = MAPL_DimsTileOnly, &

0 commit comments

Comments
 (0)