Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-tiling clean-up and additional RESTART options #149

Merged
merged 50 commits into from
Mar 13, 2020
Merged

Re-tiling clean-up and additional RESTART options #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9baf381
bring MAPL-2.0 and related components to GEOSldas
weiyuan-jiang Oct 18, 2019
4b11012
exact match with MAPL-2.0 ( hangs in mpi_win_fence())
weiyuan-jiang Oct 22, 2019
557a57b
1)add assimilation for cubed-sphere grid
weiyuan-jiang Dec 2, 2019
484bbeb
reshape forcing for cs grid. Remove conditioning on pertubation
weiyuan-jiang Dec 5, 2019
34f63b3
Merge pull request #76 from GEOS-ESM/develop
weiyuan-jiang Dec 6, 2019
74e14af
Merge branch 'dev/MAPL-2.0' into develop_smap
weiyuan-jiang Dec 6, 2019
bef0abf
Merge pull request #77 from GEOS-ESM/develop_smap
weiyuan-jiang Dec 6, 2019
2f19d14
typo fix. zero diff with develop branch
weiyuan-jiang Dec 6, 2019
159ec76
Update lenkf.j.template
weiyuan-jiang Dec 18, 2019
fff1df9
rm Develop.cfg
weiyuan-jiang Dec 18, 2019
d77a8cf
Merge branch 'develop' into dev/MAPL-2.0
weiyuan-jiang Dec 18, 2019
f83acd9
change External.cfg to match removed Develop.cfg
weiyuan-jiang Dec 18, 2019
d028df8
Update LDAS_Forcing.F90
gmao-rreichle Dec 18, 2019
4df544f
Merge pull request #96 from GEOS-ESM/develop
weiyuan-jiang Jan 2, 2020
8f30572
change env and cmake version
weiyuan-jiang Jan 7, 2020
1cf3be0
add export for incr
weiyuan-jiang Jan 13, 2020
5286540
rm redundant NX NY and _FILE
weiyuan-jiang Jan 14, 2020
7729a73
conform gcc-9.1 and bug fix in select-update_type 9 (abs(deltaT)>0.)
weiyuan-jiang Jan 15, 2020
0d84367
fix HISTORY.rc example for MAPL-2.0
weiyuan-jiang Jan 17, 2020
a2b680a
Merge pull request #104 from GEOS-ESM/develop
weiyuan-jiang Jan 24, 2020
3bff1a1
1)create local nc4 vegdyn restart
weiyuan-jiang Jan 28, 2020
eb15ce1
Merge branch 'dev/MAPL-2.0' of github.com:GEOS-ESM/GEOSldas into dev/…
weiyuan-jiang Jan 28, 2020
b9d60d3
use intel mpi
weiyuan-jiang Jan 31, 2020
400e91e
rm file_type that is detected by MAPL
weiyuan-jiang Feb 1, 2020
4a7033f
remove compression of landpert rst.
weiyuan-jiang Feb 10, 2020
5acf0e0
revised GEOSldas regridding
smahanam Feb 10, 2020
f4b7806
fixed typo: "sponser" --> "sponsor"
gmao-rreichle Feb 10, 2020
a8d74e2
removed obsolete lines with hard-coded values for SURFLAY
gmao-rreichle Feb 10, 2020
c94b356
mk_LDASsaRestarts.F90 was renamed to mk_GEOSldasRestarts.F90
smahanam Feb 13, 2020
e5a79a2
Merge branch 'WJ_ldassa_regrid' of github.com:GEOS-ESM/GEOSldas into …
smahanam Feb 13, 2020
171c4c7
renamed mk_LDASsaRestarts to mk_GEOSldasRestarts
smahanam Feb 13, 2020
d5524ef
added MERRA2 regridding
smahanam Feb 14, 2020
26e1bb3
Merge branch 'develop' into WJ_ldassa_regrid
weiyuan-jiang Feb 15, 2020
f9082d2
file name fixed
weiyuan-jiang Feb 15, 2020
5612fbf
speed up and clean up
weiyuan-jiang Feb 15, 2020
097c7cd
added MERRA2 regridding capability
smahanam Feb 17, 2020
4e7251e
pushed back to the previous version to be able to compile without upd…
smahanam Feb 17, 2020
928b495
riverted to WJ's MAPL 2 version
smahanam Feb 18, 2020
f95200a
Merge branch 'WJ_ldassa_regrid' of github.com:GEOS-ESM/GEOSldas into …
smahanam Feb 18, 2020
3fc844e
Added FP and user's AGCM restarts regridding
smahanam Feb 18, 2020
d8c2c87
some corrections to the previous versions of process_rst and ldas_setup
smahanam Feb 19, 2020
01f22e8
deleted and unneccssary line from process_rst.csh
smahanam Feb 19, 2020
d35dd89
mv getids.H to mk_shared.F90
weiyuan-jiang Feb 20, 2020
8a702e6
rename mk_restarts_shared module
weiyuan-jiang Feb 21, 2020
87d30a3
change back to getids.F90
weiyuan-jiang Mar 3, 2020
acc23a6
Merge branch 'develop' into WJ_ldassa_regrid
weiyuan-jiang Mar 3, 2020
86cbb96
clean up
weiyuan-jiang Mar 4, 2020
ae3d0d4
rename ReadTileFile
weiyuan-jiang Mar 4, 2020
a175b1a
Pointing Externals.cfg to develop of GCM Grid Comp
gmao-rreichle Mar 12, 2020
4eb05f8
Clarified RESTART options.
gmao-rreichle Mar 12, 2020
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
1 change: 1 addition & 0 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ required = True
repo_url = git@github.com:GEOS-ESM/GEOSgcm_GridComp.git
local_path = ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp
branch = develop
#tag = v1.6.0
protocol = git
sparse = ../../../../config/GEOSgcm_GridComp_ldas.sparse

Expand Down
2 changes: 1 addition & 1 deletion src/Applications/LDAS_App/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ foreach (prog ${executables})
ecbuild_add_executable (
TARGET ${prog}.x
SOURCES ${prog}.F90
LIBS GEOSldas_GridComp)
LIBS GEOSldas_GridComp mk_restarts)
endforeach ()

install(
Expand Down
2 changes: 1 addition & 1 deletion src/Applications/LDAS_App/GEOSldas.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ program LDAS_Main


! !USES:
use MAPL_Mod
use MAPL
use GEOS_LDASGridCompMod, only: ROOT_SetServices => SetServices

implicit none
Expand Down
252 changes: 170 additions & 82 deletions src/Applications/LDAS_App/ldas_setup
View file
Open in desktop

Large diffs are not rendered by default.

Loading