Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
70df564
initial check in (it can be built)
weiyuan-jiang Feb 9, 2024
6566c79
Merge branch 'develop' into feature/wjiang/add_landice
gmao-rreichle Feb 16, 2024
7bd6302
fixed locstream and timer for LANDICE
weiyuan-jiang Feb 19, 2024
b5be8c0
Merge branch 'feature/wjiang/add_landice' of github.com:GEOS-ESM/GEOS…
weiyuan-jiang Feb 19, 2024
157004f
add landice grid comp
weiyuan-jiang Apr 9, 2024
a145779
add postprocess for landice
weiyuan-jiang Apr 9, 2024
a09206b
Merge branch 'feature/wjiang/add_landice_1' into feature/wjiang/add_l…
weiyuan-jiang Apr 10, 2024
199ddc1
remove unnecessary arguments
weiyuan-jiang Apr 12, 2024
54304cd
Merge branch 'develop' into feature/wjiang/add_landice
weiyuan-jiang Apr 12, 2024
0c5bf7c
distribute forces
weiyuan-jiang Apr 25, 2024
430a4d6
use partial tiel_coord in metforce
weiyuan-jiang Apr 25, 2024
2184d72
change local index to global index
weiyuan-jiang Apr 26, 2024
9c0b76f
remove name '_internal" from landassim_obs...
weiyuan-jiang Apr 26, 2024
dddd9f1
rename model to landmodel
weiyuan-jiang Apr 29, 2024
1ea1c10
Merge branch 'develop' into feature/wjiang/add_landice
gmao-rreichle May 17, 2024
8bfa673
Merge branch 'develop' into feature/wjiang/add_landice
gmao-rreichle Jun 13, 2024
d553e78
first check in for mapping files
weiyuan-jiang Jun 17, 2024
e158958
change f2g contents for other tile types
weiyuan-jiang Jul 17, 2024
abfe6f0
works for no zoom in
weiyuan-jiang Jul 18, 2024
0242100
good for zoomin without other tile types
weiyuan-jiang Jul 18, 2024
72c8daf
create zoomin landice restart and more cleanup
weiyuan-jiang Aug 14, 2024
13f7bac
working...
weiyuan-jiang Aug 16, 2024
d4936a6
consolidate creating the restarts
weiyuan-jiang Aug 19, 2024
18102e8
Merge branch 'develop' into feature/wjiang/add_landice
biljanaorescanin Aug 19, 2024
2c5102e
bug fix
weiyuan-jiang Aug 19, 2024
10709a4
more bug fix
weiyuan-jiang Aug 19, 2024
6f343db
bug fixed (i_indg) and add LAND_TYPES item
weiyuan-jiang Aug 29, 2024
a5b2d2a
landice model simulation only
weiyuan-jiang Oct 16, 2024
7c16f21
fix bug on setup
weiyuan-jiang Oct 16, 2024
7cf84b7
first run and fix bug
weiyuan-jiang Oct 16, 2024
ade5d1b
exit with error code
weiyuan-jiang Dec 9, 2024
e029791
Merge branch 'develop' into feature/wjiang/add_landice
weiyuan-jiang Jan 20, 2025
66d1e72
modifications to improve landice functionality
Mar 19, 2025
d583768
changes to deconflict variable names
Mar 19, 2025
2d0a695
add support to read nc4 tile file from BCS
weiyuan-jiang Mar 24, 2025
96d2564
Merge branch 'feature/wjiang/add_landice' into feature/wjiang/nc4_til…
weiyuan-jiang Mar 24, 2025
2f7226d
add tile_file_type
weiyuan-jiang Apr 7, 2025
7cf936e
using nc4 tile file
weiyuan-jiang Apr 8, 2025
ca2fcf1
fix typo
weiyuan-jiang Apr 9, 2025
6bf0c4e
fix bugs and optimization
weiyuan-jiang Apr 11, 2025
1ca8fc7
change log
weiyuan-jiang Apr 11, 2025
da62d72
Merge pull request #85 from GEOS-ESM/feature/wjiang/nc4_tilefile
weiyuan-jiang Apr 11, 2025
d180802
Merge branch 'develop' into feature/wjiang/add_landice
weiyuan-jiang Apr 11, 2025
7e1e640
Merge branch 'develop' into feature/wjiang/add_landice
gmao-rreichle Apr 15, 2025
5a484a1
Merge branch 'develop' into feature/wjiang/add_landice
gmao-rreichle Apr 15, 2025
17f376c
fix RESTART=M
weiyuan-jiang Apr 24, 2025
1722180
Merge branch 'feature/wjiang/add_landice' of github.com:GEOS-ESM/GEOS…
weiyuan-jiang Apr 24, 2025
1b8202a
fix RESTART=M option for landice
weiyuan-jiang Apr 25, 2025
d72b052
modifications to tile+gridded landice diag.
Apr 29, 2025
fe23430
default tile file would be nc4
weiyuan-jiang Apr 30, 2025
3b67b49
set default elevation to nodata_generic
weiyuan-jiang Apr 30, 2025
85849a3
minor cleanup of previous commits (GEOSldas_LDAS.rc, ldas_setup, prep…
gmao-rreichle Apr 30, 2025
347642e
minimal edits to comments and white space (preprocess_ldas_routines.F90)
gmao-rreichle Apr 30, 2025
a2d55fc
fix bugs when there is only landice tile
weiyuan-jiang May 2, 2025
8b70947
added comments, white-space changes (LDAS_Convert.F90)
gmao-rreichle May 8, 2025
fc99bc2
clarified new rc variables (TILE_TYPES, TILE_FILE_FORMAT) in GEOSldas…
gmao-rreichle May 8, 2025
0eceba0
clarified comments, white-space changes (GEOS_LdasGridComp.F90)
gmao-rreichle May 8, 2025
ec9aede
minimal edit in "description" of glc collection (GEOSldas_HIST.rc)
gmao-rreichle May 8, 2025
13b402d
fixed white space (tile_bin2nc4.F90)
gmao-rreichle May 8, 2025
701502b
added comment (LDAS_RepairForcing.F90)
gmao-rreichle May 8, 2025
90b5f24
edited error messages (ldas_setup)
gmao-rreichle May 8, 2025
b1482ff
fixed typo in variable name, tweaked subroutine names, white-space ch…
gmao-rreichle May 8, 2025
3610892
minimal white-space changes (preprocess_ldas.F90)
gmao-rreichle May 9, 2025
e5fad70
cleanup (preprocess_ldas_routines.F90)
gmao-rreichle May 9, 2025
250f7b5
added blank after "stop" to fix gnu build error (preprocess_ldas_rout…
gmao-rreichle May 12, 2025
a92e3e6
change tile_types to numbers that are consistent throughout
weiyuan-jiang May 15, 2025
462804a
edited help text and white-space changes (GEOSldas_App/GEOSldas_LDAS.…
gmao-rreichle May 15, 2025
a53e911
refactoring...
weiyuan-jiang May 15, 2025
1651d93
a bug fix
weiyuan-jiang May 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Added functionality to simulate landice tiles.
- Added functionality to read nc4-formatted tile file.

### Changed

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ esma_add_library(${this}
SRCS GEOS_LdasGridComp.F90
SUBCOMPONENTS ${alldirs}
SUBDIRS LDAS_Shared
DEPENDENCIES GEOSland_GridComp makebcs MAPL
DEPENDENCIES GEOSland_GridComp GEOSlandice_GridComp makebcs MAPL
INCLUDES ${INC_ESMF})

esma_add_subdirectory(GEOSldas_App)
585 changes: 338 additions & 247 deletions GEOS_LdasGridComp.F90

Large diffs are not rendered by default.

69 changes: 69 additions & 0 deletions GEOSldas_App/GEOSldas_HIST.rc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ COLLECTIONS:
# 'inst3_2d_lndfcstana_Nx'
# 'const_1d_lnd_Nt'
# 'const_2d_lnd_Nx'
# 'tavg24_2d_glc_Nx'
# 'tavg24_1d_glc_Nt'
::

#CUBE GRID_LABELS: PC720x361-DC
Expand Down Expand Up @@ -543,5 +545,72 @@ COLLECTIONS:
'TPSURF_ANA_ENSSTD' , 'LANDASSIM' , 'TSURF_ANA_ENSSTD' ,
'TP1_ANA_ENSSTD' , 'LANDASSIM' , 'TSOIL1_ANA_ENSSTD'
::

tavg24_2d_glc_Nx.descr: '2d,Daily,Time-Averaged,Single-Level,Land Ice Diagnostics',
tavg24_2d_glc_Nx.nbits: 12,
tavg24_2d_glc_Nx.template: '%y4%m2%d2_%h2%n2z.nc4' ,
tavg24_2d_glc_Nx.mode: 'time-averaged' ,
tavg24_2d_glc_Nx.frequency: 240000 ,
tavg24_2d_glc_Nx.ref_time: 000000 ,
tavg24_2d_glc_Nx.format: 'CFIO' ,
tavg24_2d_glc_Nx.regrid_exch: '../input/tile.data' ,
tavg24_2d_glc_Nx.regrid_name: 'GRIDNAME' ,
tavg24_2d_glc_Nx.grid_label: PC720x361-DC , #comment this line out for cube face output
tavg24_2d_glc_Nx.deflate: 1,
tavg24_2d_glc_Nx.fields: 'ACCUM' , 'LANDICE' ,
'ALBVR' , 'LANDICE' , 'ALBVR_GL' ,
'ALBVF' , 'LANDICE' , 'ALBVF_GL' ,
'ALBNR' , 'LANDICE' , 'ALBNR_GL' ,
'ALBNF' , 'LANDICE' , 'ALBNF_GL' ,
'ASNOW_GL' , 'LANDICE' ,
'DELTS' , 'LANDICE' ,
'DNICFLX' , 'LANDICE' ,
'EVAPOUT' , 'LANDICE' ,
'QH' , 'LANDICE' ,
'GHTSKIN' , 'LANDICE' , 'GHTSKIN_GL' ,
'HLATN' , 'LANDICE' ,
'HLWUP' , 'LANDICE' , 'HLWUP_GL' ,
'IMELT' , 'LANDICE' ,
'LWNDSRF' , 'LANDICE' ,
'MELTWTR' , 'LANDICE' ,
'MELTWTRCONT' , 'LANDICE' ,
'RUNOFF' , 'LANDICE' , 'RUNOFF_GL' ,
'SHOUT' , 'LANDICE' ,
'SMELT' , 'LANDICE' ,
'SNICEALB' , 'LANDICE' ,
'SNOMAS_GL' , 'LANDICE' ,
'SNOWALB' , 'LANDICE' ,
'SNOWDP_GL' , 'LANDICE' ,
'SWNDSRF' , 'LANDICE' ,
'TST' , 'LANDICE' ,
'WESNBOT' , 'LANDICE' ,
'WESNEXT' , 'LANDICE' ,
'WESNPERC' , 'LANDICE' ,
'WESNPREC' , 'LANDICE' ,
::

tavg24_1d_glc_Nt.descr: 'Tile-space,Daily,Time-Averaged,Single-level,Land Ice Diagnostics',
tavg24_1d_glc_Nt.nbits: 12,
tavg24_1d_glc_Nt.template: '%y4%m2%d2_%h2%n2z.bin' ,
tavg24_1d_glc_Nt.mode: 'time-averaged' ,
tavg24_1d_glc_Nt.frequency: 240000 ,
tavg24_1d_glc_Nt.ref_time: 000000 ,
tavg24_1d_glc_Nt.fields: 'ASNOW_GL' , 'LANDICE' ,
'DELTS' , 'LANDICE' ,
'EVAPOUT' , 'LANDICE' ,
'GHTSKIN' , 'LANDICE' , 'GHTSKIN_GL' ,
'HLATN' , 'LANDICE' ,
'HLWUP' , 'LANDICE' , 'HLWUP_GL' ,
'LWNDSRF' , 'LANDICE' ,
'MELTWTR' , 'LANDICE' ,
'MELTWTRCONT' , 'LANDICE' ,
'RUNOFF' , 'LANDICE' , 'RUNOFF_GL' ,
'SHOUT' , 'LANDICE' ,
'SNOMAS_GL' , 'LANDICE' ,
'SNOWDP_GL' , 'LANDICE' ,
'SWNDSRF' , 'LANDICE' ,
'TST' , 'LANDICE' ,
'WESNBOT' , 'LANDICE' ,
'WESNEXT' , 'LANDICE' ,
::
# ========================== EOF ==============================================================
24 changes: 23 additions & 1 deletion GEOSldas_App/GEOSldas_LDAS.rc
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,36 @@ CATCHMENT_OFFLINE: 1
CATCHMENT_SPINUP: 0


# ---- Choice of land surface model
# ---- Choice of land surface model (for LAND tiles)
#
# 1 : Catchment model (default)
# 2 : CatchmentCN-CLM4.0
#
LSM_CHOICE: 1


# ---- Choice of tile type(s)
#
# List of tile types to be included in simulation.
# Use blank space as separator if there is more than one type.
#
# land : 100 (non-glaciated land)
# landice : 20 ( glaciated land)
# lake : 19 [not yet implemented]
#
# For example, include land and landice tiles as follows:
# TILE_TYPES: 100 20
#
TILE_TYPES: 100

# ---- Format of tile file (from bcs directory)
#
# DEFAULT : Use nc4 tile file if it exists, txt tile file otherwise
# TXT : Use txt tile file (e.g., for 0-diff testing)
#
TILE_FILE_FORMAT: DEFAULT


# ---- Domain definition
#
# The domain is determined by specifying a lat/lon rectangle in conjunction
Expand Down
Loading
Loading