Skip to content

Commit

Permalink
Merge pull request #1032 from GEOS-ESM/feature/rreichle/update_export…
Browse files Browse the repository at this point in the history 
…s_to_M21C_filespecs

update LONG_NAME attributes to match M21C file specs; conservative regridding of (obs) PRECIP_FILE inputs
  • Loading branch information
@sdrabenh
sdrabenh authored Dec 5, 2024
2 parents 96a8a26 + fc85026 commit 18cb3ca
Show file tree
Hide file tree
Showing 14 changed files with 229 additions and 194 deletions.
127 changes: 81 additions & 46 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp/GEOS_LakeGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_beam', &
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBVR', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -146,7 +146,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
UNITS = '1', &
SHORT_NAME = 'ALBVF', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -155,7 +155,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBNR', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -164,7 +164,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
UNITS = '1', &
SHORT_NAME = 'ALBNF', &
DIMS = MAPL_DimsTileOnly, &
Expand Down Expand Up @@ -192,7 +192,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'runoff_flux',&
LONG_NAME = 'runoff_total_flux' ,&
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'RUNOFF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
6 changes: 3 additions & 3 deletions ...Comp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_par_beam_flux',&
LONG_NAME = 'surface_downwelling_PAR_beam_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'DRPAR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -254,7 +254,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_par_diffuse_flux',&
LONG_NAME = 'surface_downwelling_PAR_diffuse_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'DFPAR' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -346,7 +346,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'greeness_fraction' ,&
LONG_NAME = 'vegetation_greenness_fraction',&
UNITS = '1' ,&
SHORT_NAME = 'GRN' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
90 changes: 45 additions & 45 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
View file

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions ...GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOSroute_GridComp/GEOS_RouteGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ subroutine SetServices ( GC, RC )
! -----------------------------------------------------------

call MAPL_AddImportSpec(GC, &
LONG_NAME = 'runoff_flux' ,&
LONG_NAME = 'runoff_total_flux' ,&
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'RUNOFF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
2 changes: 1 addition & 1 deletion ...idComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOSvegdyn_GridComp/GEOS_VegdynGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC ,&
SHORT_NAME = 'GRN' ,&
LONG_NAME = 'greeness_fraction' ,&
LONG_NAME = 'vegetation_greenness_fraction' ,&
UNITS = '1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
Expand Down
30 changes: 15 additions & 15 deletions ...p/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_beam', &
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBVR', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -207,7 +207,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
UNITS = '1', &
SHORT_NAME = 'ALBVF', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -216,7 +216,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBNR', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -225,7 +225,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
UNITS = '1', &
SHORT_NAME = 'ALBNF', &
DIMS = MAPL_DimsTileOnly, &
Expand All @@ -235,7 +235,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'TST', &
LONG_NAME = 'surface_skin_temperature', &
LONG_NAME = 'surface_temperature', &
UNITS = 'K', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -397,7 +397,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'fractional_area_of_glaciated_surface_snowcover',&
LONG_NAME = 'fractional_snow_covered_area_of_glaciated_surface',&
UNITS = '1' ,&
SHORT_NAME = 'ASNOW_GL' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -485,7 +485,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'top_snow_layer_mass_change_due_to_sub_con', &
LONG_NAME = 'top_snow_layer_mass_change_due_to_sublimation_and_condensation', &
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'WESNSC' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -569,7 +569,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'contribution_to_smb_from_refreezed_rain_over_bare_ice', &
LONG_NAME = 'contribution_to_surface_mass_balance_from_rain_frozen_onto_bare_ice', &
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'RAINRFZ' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -578,7 +578,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'snowmelt_flux' ,&
LONG_NAME = 'snow_melt_flux' ,&
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'SMELT' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -587,7 +587,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'icemelt_flux' ,&
LONG_NAME = 'ice_melt_flux' ,&
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'IMELT' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -596,7 +596,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'snow_broadband_albedo', &
LONG_NAME = 'snow_broadband_reflectivity', &
UNITS = '1' ,&
SHORT_NAME = 'SNOWALB' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -605,7 +605,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'aggregated_snow_ice_broadband_albedo', &
LONG_NAME = 'aggregated_snow_ice_broadband_reflectivity', &
UNITS = '1' ,&
SHORT_NAME = 'SNICEALB' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -623,7 +623,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'melt_water_content', &
LONG_NAME = 'snowpack_meltwater_content', &
UNITS = 'kg m-2' ,&
SHORT_NAME = 'MELTWTRCONT' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -641,7 +641,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'runoff_flux' ,&
LONG_NAME = 'runoff_total_flux' ,&
UNITS = 'kg m-2 s-1' ,&
SHORT_NAME = 'RUNOFF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -848,7 +848,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'Ground_heating_for_tskin' ,&
LONG_NAME = 'glacier_ice_heating_flux' ,&
UNITS = 'W m-2' ,&
SHORT_NAME = 'GHTSKIN' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
16 changes: 8 additions & 8 deletions ...ics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_CICE4ColumnPhysGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,31 +181,31 @@ subroutine SetServices ( GC, RC )
_RC )

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_beam', &
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBVR', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC )

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
UNITS = '1', &
SHORT_NAME = 'ALBVF', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC )

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBNR', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC )

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
UNITS = '1', &
SHORT_NAME = 'ALBNF', &
DIMS = MAPL_DimsTileOnly, &
Expand Down Expand Up @@ -1266,7 +1266,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'SIALB' ,&
LONG_NAME = 'broad_band_sea_ice_albedo' ,&
LONG_NAME = 'broad_band_sea_ice_reflectivity' ,&
UNITS = '1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
Expand Down Expand Up @@ -1388,7 +1388,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'ialb_CMIP5' ,&
LONG_NAME = 'bare_sea_ice_albedo' ,&
LONG_NAME = 'bare_sea_ice_reflectivity' ,&
UNITS = '1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
Expand Down Expand Up @@ -1527,7 +1527,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'ALBIN' ,&
LONG_NAME = 'ice_surface_albedo_over_ice_categories' ,&
LONG_NAME = 'ice_surface_reflectivity_over_ice_categories' ,&
UNITS = '1' ,&
DIMS = MAPL_DimsTileOnly ,&
UNGRIDDED_DIMS = (/NUM_ICE_CATEGORIES/) ,&
Expand All @@ -1536,7 +1536,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'ALBSN' ,&
LONG_NAME = 'snow_surface_albedo_over_ice_categories' ,&
LONG_NAME = 'snow_surface_reflectivity_over_ice_categories' ,&
UNITS = '1' ,&
DIMS = MAPL_DimsTileOnly ,&
UNGRIDDED_DIMS = (/NUM_ICE_CATEGORIES/) ,&
Expand Down
8 changes: 4 additions & 4 deletions ...OSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_OpenWaterGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,31 +192,31 @@ subroutine SetServices ( GC, RC )
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_beam', &
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBVR', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
UNITS = '1', &
SHORT_NAME = 'ALBVF', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBNR', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
UNITS = '1', &
SHORT_NAME = 'ALBNF', &
DIMS = MAPL_DimsTileOnly, &
Expand Down
8 changes: 4 additions & 4 deletions ...OSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp/GEOS_SaltWaterGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,31 +183,31 @@ subroutine SetServices ( GC, RC )
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_beam', &
LONG_NAME = 'surface_reflectivity_for_visible_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBVR', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_visible_diffuse',&
LONG_NAME = 'surface_reflectivity_for_visible_diffuse',&
UNITS = '1', &
SHORT_NAME = 'ALBVF', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_beam', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_beam', &
UNITS = '1', &
SHORT_NAME = 'ALBNR', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
_RC)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_albedo_for_near_infrared_diffuse', &
LONG_NAME = 'surface_reflectivity_for_near_infrared_diffuse', &
UNITS = '1', &
SHORT_NAME = 'ALBNF', &
DIMS = MAPL_DimsTileOnly, &
Expand Down
Loading

0 comments on commit 18cb3ca

Please sign in to comment.