Skip to content

Commit

Permalink
Merge pull request #635 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
Sync develop into main
  • Loading branch information
@sdrabenh
sdrabenh authored Aug 1, 2024
2 parents c10a1e4 + 4ceccc3 commit a0fcb97
Show file tree
Hide file tree
Showing 8 changed files with 1,146 additions and 1,176 deletions.
47 changes: 24 additions & 23 deletions HISTORY.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -942,14 +942,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'TSOIL4' , 'SURFACE' ,
'TSOIL5' , 'SURFACE' ,
'TSOIL6' , 'SURFACE' ,
'SNO' , 'MOIST' , 'PRECSNO' ,
'TPREC' , 'MOIST' , 'PRECTOT' ,
'SNOLAND' , 'SURFACE' , 'PRECSNOLAND' ,
'PRLAND' , 'SURFACE' , 'PRECTOTLAND' ,
'TSLAND' , 'SURFACE' , 'SNOMAS' ,
'SNOWDP' , 'SURFACE' , 'SNODP' ,
'EVPSOI' , 'SURFACE' , 'EVPSOIL' ,
'EVPVEG' , 'SURFACE' , 'EVPTRNS' ,
'EVPINT' , 'SURFACE' , 'EVPINTR' ,
'EVPICE' , 'SURFACE' , 'EVPSBLN' ,
'EVPSOI' , 'SURFACE' , 'LHLANDSOIL',
'EVPVEG' , 'SURFACE' , 'LHLANDTRNS',
'EVPINT' , 'SURFACE' , 'LHLANDINTR',
'EVPICE' , 'SURFACE' , 'LHLANDSBLN',
'RUNSURF' , 'SURFACE' , 'RUNOFF' ,
'BASEFLOW' , 'SURFACE' ,
'SMLAND' , 'SURFACE' ,
Expand All @@ -958,8 +958,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'FRSAT' , 'SURFACE' ,
'ASNOW' , 'SURFACE' , 'FRSNO' ,
'FRWLT' , 'SURFACE' ,
'DFPAR' , 'SOLAR' , 'PARDF' ,
'DRPAR' , 'SOLAR' , 'PARDR' ,
'DFPARLAND' , 'SURFACE' , 'PARDFLAND' ,
'DRPARLAND' , 'SURFACE' , 'PARDRLAND' ,
'SHLAND' , 'SURFACE' ,
'LHLAND' , 'SURFACE' ,
'EVLAND' , 'SURFACE' ,
Expand All @@ -970,9 +970,10 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'TELAND' , 'SURFACE' ,
'DWLAND' , 'SURFACE' , 'WCHANGE' ,
'DHLAND' , 'SURFACE' , 'ECHANGE' ,
'SPLAND' , 'SURFACE' ,
'SPWATR' , 'SURFACE' ,
'SPSNOW' , 'SURFACE' ,
'SPLAND' , 'SURFACE' , 'SPSHLAND' ,
'SPLH' , 'SURFACE' , 'SPLHLAND' ,
'SPWATR' , 'SURFACE' , 'SPEVLAND' ,
'SPSNOW' , 'SURFACE' , 'SPSNLAND' ,
::

tavg1_2d_lfo_Nx-.format: 'CFIO' ,
Expand All @@ -986,7 +987,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
tavg1_2d_lfo_Nx-.end_date: >>>IOEDATE<<< ,
tavg1_2d_lfo_Nx-.end_time: >>>IOETIME<<< ,
tavg1_2d_lfo_Nx-.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
'SWLAND' , 'SURFACE' ,
'LWS' , 'IRRAD' , 'LWGAB' ,
'PCU' , 'SURFACE' , 'PRECCU' ,
'PLS' , 'SURFACE' , 'PRECLS' ,
Expand Down Expand Up @@ -2259,14 +2259,14 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'TSOIL4' , 'SURFACE' ,
'TSOIL5' , 'SURFACE' ,
'TSOIL6' , 'SURFACE' ,
'SNO' , 'MOIST' , 'PRECSNO' ,
'TPREC' , 'MOIST' , 'PRECTOT' ,
'SNOLAND' , 'SURFACE' , 'PRECSNOLAND' ,
'PRLAND' , 'SURFACE' , 'PRECTOTLAND' ,
'TSLAND' , 'SURFACE' , 'SNOMAS' ,
'SNOWDP' , 'SURFACE' , 'SNODP' ,
'EVPSOI' , 'SURFACE' , 'EVPSOIL' ,
'EVPVEG' , 'SURFACE' , 'EVPTRNS' ,
'EVPINT' , 'SURFACE' , 'EVPINTR' ,
'EVPICE' , 'SURFACE' , 'EVPSBLN' ,
'EVPSOI' , 'SURFACE' , 'LHLANDSOIL',
'EVPVEG' , 'SURFACE' , 'LHLANDTRNS',
'EVPINT' , 'SURFACE' , 'LHLANDINTR',
'EVPICE' , 'SURFACE' , 'LHLANDSBLN',
'RUNSURF' , 'SURFACE' , 'RUNOFF' ,
'BASEFLOW' , 'SURFACE' ,
'SMLAND' , 'SURFACE' ,
Expand All @@ -2275,8 +2275,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'FRSAT' , 'SURFACE' ,
'ASNOW' , 'SURFACE' , 'FRSNO' ,
'FRWLT' , 'SURFACE' ,
'DFPAR' , 'SOLAR' , 'PARDF' ,
'DRPAR' , 'SOLAR' , 'PARDR' ,
'DFPARLAND' , 'SURFACE' , 'PARDFLAND' ,
'DRPARLAND' , 'SURFACE' , 'PARDRLAND' ,
'SHLAND' , 'SURFACE' ,
'LHLAND' , 'SURFACE' ,
'EVLAND' , 'SURFACE' ,
Expand All @@ -2287,9 +2287,10 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'TELAND' , 'SURFACE' ,
'DWLAND' , 'SURFACE' , 'WCHANGE' ,
'DHLAND' , 'SURFACE' , 'ECHANGE' ,
'SPLAND' , 'SURFACE' ,
'SPWATR' , 'SURFACE' ,
'SPSNOW' , 'SURFACE' ,
'SPLAND' , 'SURFACE' , 'SPSHLAND' ,
'SPLH' , 'SURFACE' , 'SPLHLAND' ,
'SPWATR' , 'SURFACE' , 'SPEVLAND' ,
'SPSNOW' , 'SURFACE' , 'SPSNLAND' ,
::

tavg1_2d_rad_Nx+-.format: 'CFIO' ,
Expand Down
Loading

0 comments on commit a0fcb97

Please sign in to comment.