Skip to content

Commit

Permalink
Merge pull request #764 from GEOS-ESM/bugfix/rreichle/Surface_Longwav…
Browse files Browse the repository at this point in the history 
…e_LONG_NAMES

correct LONG_NAME for absorbed and emitted longwave flux in Surface
  • Loading branch information
@sdrabenh
sdrabenh committed Jun 7, 2023
2 parents 7707e85 + 040c2bc commit 1c198ae
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 58 deletions.
12 changes: 6 additions & 6 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'LWDNSRF', &
LONG_NAME = 'surface_downwelling_longwave_flux', &
LONG_NAME = 'surface_absorbed_longwave_flux', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -598,7 +598,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'ALW', &
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux', &
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -607,7 +607,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'BLW', &
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux', &
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux', &
UNITS = 'W m-2 K-1', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -1761,7 +1761,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWUPSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_emitted_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -1770,7 +1770,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWDNSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_absorbed_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -1949,7 +1949,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_outgoing_longwave_flux',&
LONG_NAME = 'surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'HLWUP' ,&
DIMS = MAPL_DimsHorzOnly ,&
Expand Down
8 changes: 4 additions & 4 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 @@ -210,7 +210,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_outgoing_longwave_flux',&
LONG_NAME = 'surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'HLWUP' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -618,7 +618,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'ALW', &
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux', &
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -627,7 +627,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'BLW', &
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux', &
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux', &
UNITS = 'W m-2 K-1', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -690,7 +690,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddImportSpec(GC, &
SHORT_NAME = 'LWDNSRF', &
LONG_NAME = 'surface_downwelling_longwave_flux', &
LONG_NAME = 'surface_absorbed_longwave_flux', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
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 @@ -278,7 +278,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_longwave_flux',&
LONG_NAME = 'surface_absorbed_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'LWDNSRF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -287,7 +287,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'ALW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -296,7 +296,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W_m-2 K-1' ,&
SHORT_NAME = 'BLW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down
16 changes: 8 additions & 8 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_longwave_flux',&
LONG_NAME = 'surface_absorbed_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'LWDNSRF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -486,7 +486,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'ALW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -495,7 +495,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W_m-2 K-1' ,&
SHORT_NAME = 'BLW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -2346,7 +2346,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_outgoing_longwave_flux',&
LONG_NAME = 'surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'HLWUP' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -3036,7 +3036,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWUPSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_emitted_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -3045,7 +3045,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWDNSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_absorbed_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -7209,7 +7209,7 @@ subroutine Driver ( RC )

RA(:,FSAT), RA(:,FTRN), RA(:,FWLT), RA(:,FSNW) ,&

ZTH, SWNETFREE, SWNETSNOW, LWDNSRF ,&
ZTH, SWNETFREE, SWNETSNOW, LWDNSRF ,& ! LWDNSRF = *absorbed* longwave only (excl reflected)

PS*.01 ,&

Expand Down Expand Up @@ -7239,7 +7239,7 @@ subroutine Driver ( RC )
BFLOW ,&
RUNSURF ,&
SMELT ,&
HLWUP ,&
HLWUP ,& ! *emitted* longwave only (excl reflected)
SWNDSRF ,&
HLATN ,&
QINFIL ,&
Expand Down
16 changes: 8 additions & 8 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_longwave_flux',&
LONG_NAME = 'surface_absorbed_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'LWDNSRF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -481,7 +481,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'ALW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -490,7 +490,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W_m-2 K-1' ,&
SHORT_NAME = 'BLW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -2273,7 +2273,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_outgoing_longwave_flux',&
LONG_NAME = 'surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'HLWUP' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -2963,7 +2963,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWUPSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_emitted_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -2972,7 +2972,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWDNSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_absorbed_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -7482,7 +7482,7 @@ subroutine Driver ( RC )

RA(:,FSAT), RA(:,FTRN), RA(:,FWLT), RA(:,FSNW) ,&

ZTH, SWNETFREE, SWNETSNOW, LWDNSRF ,&
ZTH, SWNETFREE, SWNETSNOW, LWDNSRF ,& ! LWDNSRF = *absorbed* longwave only (excl reflected)

PS*.01 ,&

Expand Down Expand Up @@ -7512,7 +7512,7 @@ subroutine Driver ( RC )
BFLOW ,&
RUNSURF ,&
SMELT ,&
HLWUP ,&
HLWUP ,& ! *emitted* longwave only (excl reflected)
SWNDSRF ,&
HLATN ,&
QINFIL ,&
Expand Down
4 changes: 2 additions & 2 deletions ...idComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SUBROUTINE CATCHCN ( &
ETURB4, DEDQA4, DEDTC4, HSTURB4,DHSDQA4, DHSDTC4, &
ETURBS, DEDQAS, DEDTCS, HSTURBS,DHSDQAS, DHSDTCS, &
TM, QM, ra1, ra2, ra4, raS, SUNANG, &
SWNETF,SWNETS, HLWDWN, PSUR, ZLAI, GREEN, &
SWNETF,SWNETS, HLWDWN, PSUR, ZLAI, GREEN, & ! HLWDWN = *absorbed* longwave only (excl reflected)
SQSCAT, RSOIL1, RSOIL2, RDC, &
QSAT1, DQS1, ALW1, BLW1, QSAT2, DQS2, ALW2, BLW2, &
QSAT4, DQS4, ALW4, BLW4, QSATS, DQSS, ALWS, BLWS, &
Expand All @@ -162,7 +162,7 @@ SUBROUTINE CATCHCN ( &
CATDEF, RZEXC, srfexc, GHTCNT, &
WESNN, HTSNNN, SNDZN, EVAP, SHFLUX, RUNOFF, &
EINT, ESOI, EVEG, ESNO, BFLOW,RUNSRF,SMELT, &
HLWUP,SWLAND,HLATN,QINFIL,AR1, AR2, RZEQ, &
HLWUP,SWLAND,HLATN,QINFIL,AR1, AR2, RZEQ, & ! HLWUP = *emitted* longwave only (excl reflected)
GHFLUX, GHFLUXSNO, GHTSKIN, TPSN1, ASNOW0, &
TP1, TP2, TP3, TP4, TP5, TP6, &
sfmc, rzmc, prmc, entot, wtot, WCHANGE, ECHANGE, HSNACC, &
Expand Down
16 changes: 8 additions & 8 deletions ...GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'surface_downwelling_longwave_flux',&
LONG_NAME = 'surface_absorbed_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'LWDNSRF' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -430,7 +430,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'ALW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand All @@ -439,7 +439,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
LONG_NAME = 'linearization_of_surface_upwelling_longwave_flux',&
LONG_NAME = 'linearization_of_surface_emitted_longwave_flux',&
UNITS = 'W_m-2 K-1' ,&
SHORT_NAME = 'BLW' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -1718,7 +1718,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
LONG_NAME = 'surface_outgoing_longwave_flux',&
LONG_NAME = 'surface_emitted_longwave_flux',&
UNITS = 'W m-2' ,&
SHORT_NAME = 'HLWUP' ,&
DIMS = MAPL_DimsTileOnly ,&
Expand Down Expand Up @@ -2408,7 +2408,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWUPSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_emitted_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand All @@ -2417,7 +2417,7 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'LWDNSNOW', &
LONG_NAME = 'Net_longwave_snow', &
LONG_NAME = 'surface_absorbed_longwave_flux_snow', &
UNITS = 'W m-2', &
DIMS = MAPL_DimsTileOnly, &
VLOCATION = MAPL_VLocationNone, &
Expand Down Expand Up @@ -5452,7 +5452,7 @@ subroutine Driver ( RC )

RA(:,FSAT), RA(:,FTRN), RA(:,FWLT), RA(:,FSNW) ,&

ZTH, DRPAR, DFPAR, SWNETFREE, SWNETSNOW, LWDNSRF ,&
ZTH, DRPAR, DFPAR, SWNETFREE, SWNETSNOW, LWDNSRF ,& ! LWDNSRF = *absorbed* longwave only (excl reflected)

PS*.01 ,&

Expand All @@ -5479,7 +5479,7 @@ subroutine Driver ( RC )
BFLOW ,&
RUNSURF ,&
SMELT ,&
HLWUP ,&
HLWUP ,& ! *emitted* longwave only (excl reflected)
SWNDSRF ,&
HLATN ,&
QINFIL ,&
Expand Down
Loading

0 comments on commit 1c198ae

Please sign in to comment.