Skip to content

Commit 254e650

Browse files
amfox37amfox37
committed
Merge branch 'develop' into feature/amfox/scf_model_based_qc
2 parents 313873c + bfd97b3 commit 254e650

14 files changed

+2194
-1616
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Added
1313

14+
- Added functionality to simulate landice tiles.
15+
- Added functionality to read nc4-formatted tile file.
16+
1417
### Changed
1518

1619
### Fixed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ esma_add_library(${this}
1111
SRCS GEOS_LdasGridComp.F90
1212
SUBCOMPONENTS ${alldirs}
1313
SUBDIRS LDAS_Shared
14-
DEPENDENCIES GEOSland_GridComp makebcs MAPL
14+
DEPENDENCIES GEOSland_GridComp GEOSlandice_GridComp makebcs MAPL
1515
INCLUDES ${INC_ESMF})
1616

1717
esma_add_subdirectory(GEOSldas_App)

‎GEOS_LdasGridComp.F90‎

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

‎GEOSldas_App/GEOSldas_HIST.rc‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ COLLECTIONS:
2525
# 'inst3_2d_lndfcstana_Nx'
2626
# 'const_1d_lnd_Nt'
2727
# 'const_2d_lnd_Nx'
28+
# 'tavg24_2d_glc_Nx'
29+
# 'tavg24_1d_glc_Nt'
2830
::
2931

3032
#CUBE GRID_LABELS: PC720x361-DC
@@ -543,5 +545,72 @@ COLLECTIONS:
543545
'TPSURF_ANA_ENSSTD' , 'LANDASSIM' , 'TSURF_ANA_ENSSTD' ,
544546
'TP1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
545547
::
548+
549+
tavg24_2d_glc_Nx.descr: '2d,Daily,Time-Averaged,Single-Level,Land Ice Diagnostics',
550+
tavg24_2d_glc_Nx.nbits: 12,
551+
tavg24_2d_glc_Nx.template: '%y4%m2%d2_%h2%n2z.nc4' ,
552+
tavg24_2d_glc_Nx.mode: 'time-averaged' ,
553+
tavg24_2d_glc_Nx.frequency: 240000 ,
554+
tavg24_2d_glc_Nx.ref_time: 000000 ,
555+
tavg24_2d_glc_Nx.format: 'CFIO' ,
556+
tavg24_2d_glc_Nx.regrid_exch: '../input/tile.data' ,
557+
tavg24_2d_glc_Nx.regrid_name: 'GRIDNAME' ,
558+
tavg24_2d_glc_Nx.grid_label: PC720x361-DC , #comment this line out for cube face output
559+
tavg24_2d_glc_Nx.deflate: 1,
560+
tavg24_2d_glc_Nx.fields: 'ACCUM' , 'LANDICE' ,
561+
'ALBVR' , 'LANDICE' , 'ALBVR_GL' ,
562+
'ALBVF' , 'LANDICE' , 'ALBVF_GL' ,
563+
'ALBNR' , 'LANDICE' , 'ALBNR_GL' ,
564+
'ALBNF' , 'LANDICE' , 'ALBNF_GL' ,
565+
'ASNOW_GL' , 'LANDICE' ,
566+
'DELTS' , 'LANDICE' ,
567+
'DNICFLX' , 'LANDICE' ,
568+
'EVAPOUT' , 'LANDICE' ,
569+
'QH' , 'LANDICE' ,
570+
'GHTSKIN' , 'LANDICE' , 'GHTSKIN_GL' ,
571+
'HLATN' , 'LANDICE' ,
572+
'HLWUP' , 'LANDICE' , 'HLWUP_GL' ,
573+
'IMELT' , 'LANDICE' ,
574+
'LWNDSRF' , 'LANDICE' ,
575+
'MELTWTR' , 'LANDICE' ,
576+
'MELTWTRCONT' , 'LANDICE' ,
577+
'RUNOFF' , 'LANDICE' , 'RUNOFF_GL' ,
578+
'SHOUT' , 'LANDICE' ,
579+
'SMELT' , 'LANDICE' ,
580+
'SNICEALB' , 'LANDICE' ,
581+
'SNOMAS_GL' , 'LANDICE' ,
582+
'SNOWALB' , 'LANDICE' ,
583+
'SNOWDP_GL' , 'LANDICE' ,
584+
'SWNDSRF' , 'LANDICE' ,
585+
'TST' , 'LANDICE' ,
586+
'WESNBOT' , 'LANDICE' ,
587+
'WESNEXT' , 'LANDICE' ,
588+
'WESNPERC' , 'LANDICE' ,
589+
'WESNPREC' , 'LANDICE' ,
590+
::
546591

592+
tavg24_1d_glc_Nt.descr: 'Tile-space,Daily,Time-Averaged,Single-level,Land Ice Diagnostics',
593+
tavg24_1d_glc_Nt.nbits: 12,
594+
tavg24_1d_glc_Nt.template: '%y4%m2%d2_%h2%n2z.bin' ,
595+
tavg24_1d_glc_Nt.mode: 'time-averaged' ,
596+
tavg24_1d_glc_Nt.frequency: 240000 ,
597+
tavg24_1d_glc_Nt.ref_time: 000000 ,
598+
tavg24_1d_glc_Nt.fields: 'ASNOW_GL' , 'LANDICE' ,
599+
'DELTS' , 'LANDICE' ,
600+
'EVAPOUT' , 'LANDICE' ,
601+
'GHTSKIN' , 'LANDICE' , 'GHTSKIN_GL' ,
602+
'HLATN' , 'LANDICE' ,
603+
'HLWUP' , 'LANDICE' , 'HLWUP_GL' ,
604+
'LWNDSRF' , 'LANDICE' ,
605+
'MELTWTR' , 'LANDICE' ,
606+
'MELTWTRCONT' , 'LANDICE' ,
607+
'RUNOFF' , 'LANDICE' , 'RUNOFF_GL' ,
608+
'SHOUT' , 'LANDICE' ,
609+
'SNOMAS_GL' , 'LANDICE' ,
610+
'SNOWDP_GL' , 'LANDICE' ,
611+
'SWNDSRF' , 'LANDICE' ,
612+
'TST' , 'LANDICE' ,
613+
'WESNBOT' , 'LANDICE' ,
614+
'WESNEXT' , 'LANDICE' ,
615+
::
547616
# ========================== EOF ==============================================================

‎GEOSldas_App/GEOSldas_LDAS.rc‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,36 @@ CATCHMENT_OFFLINE: 1
2929
CATCHMENT_SPINUP: 0
3030

3131

32-
# ---- Choice of land surface model
32+
# ---- Choice of land surface model (for LAND tiles)
3333
#
3434
# 1 : Catchment model (default)
3535
# 2 : CatchmentCN-CLM4.0
3636
#
3737
LSM_CHOICE: 1
3838

3939

40+
# ---- Choice of tile type(s)
41+
#
42+
# List of tile types to be included in simulation.
43+
# Use blank space as separator if there is more than one type.
44+
#
45+
# land : 100 (non-glaciated land)
46+
# landice : 20 ( glaciated land)
47+
# lake : 19 [not yet implemented]
48+
#
49+
# For example, include land and landice tiles as follows:
50+
# TILE_TYPES: 100 20
51+
#
52+
TILE_TYPES: 100
53+
54+
# ---- Format of tile file (from bcs directory)
55+
#
56+
# DEFAULT : Use nc4 tile file if it exists, txt tile file otherwise
57+
# TXT : Use txt tile file (e.g., for 0-diff testing)
58+
#
59+
TILE_FILE_FORMAT: DEFAULT
60+
61+
4062
# ---- Domain definition
4163
#
4264
# The domain is determined by specifying a lat/lon rectangle in conjunction

0 commit comments

Comments
 (0)