Skip to content

further cleanup of make_bcs utility and CatchmentCN routines #576

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

Merged
sdrabenh merged 24 commits into from
Jun 14, 2022
Merged

further cleanup of make_bcs utility and CatchmentCN routines #576

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
baf218e
minor bug fixes and cleanup:
gmao-rreichle Apr 20, 2022
a9d3292
Merge branch 'develop' into rreichle/cleanup/make_bcs
gmao-rreichle Apr 28, 2022
9238419
substantial cleanup of subroutine create_model_para_woesten(); added…
gmao-rreichle Apr 28, 2022
a56e7a0
minor adjustment to output into catch_params.nc4 to maintain 0-diff a…
gmao-rreichle Apr 29, 2022
10e4193
substantial cleanup of subroutine soil_para_hwsd(); added comments th…
gmao-rreichle May 3, 2022
bfb3cd3
fixing bug in previous commit
gmao-rreichle May 3, 2022
ef69e84
additional comments; fixed non-zero-diff change in penultimate commit
gmao-rreichle May 4, 2022
63e815c
further clean up CLM4.5_veg_typs_fracs
weiyuan-jiang May 11, 2022
59356e9
removed obsolete separate processing of CNCLM45 plant types and fract…
gmao-jkolassa May 13, 2022
7d33b4f
updated documentation about removed mapping to CLM4.5 PFTs
gmao-jkolassa May 13, 2022
ebd2d6d
updated documentation about PFTs used in CNCLM40 and CNCLM45; changed…
gmao-jkolassa May 13, 2022
e241438
changed instances of 'CLM-Carbon' to 'Catchment-CN' except in plot ti…
gmao-jkolassa May 13, 2022
7693912
a couple of minor edits to comments in mod_process_hres_data.F90 (ina…
gmao-rreichle May 13, 2022
112fc5a
changed file names of CatchCN veg class plots: CLM-Carbon_*.jpg --> C…
gmao-rreichle May 13, 2022
1decec2
minor clarifications in comments about removal of CLM4.5 veg class pr…
gmao-rreichle May 13, 2022
6943729
reverting previous commit for mk_GEOSldasRestarts.F90 because changes…
gmao-rreichle May 13, 2022
eb952c0
Merge branch 'develop' into rreichle/cleanup/make_bcs
biljanaorescanin May 16, 2022
e39b8f9
removing scaling with fpar
biljanaorescanin May 16, 2022
87a2ddc
removed math_routines.F90, commented out obsolete functions betai(), …
gmao-rreichle May 23, 2022
1b3ace5
remove generation of obsolete bcs file CLM4.5_veg_typs_fracs (#586)
gmao-rreichle May 23, 2022
cad95dd
cleanup of incomplete CatchCN albedo scaling #589
gmao-rreichle May 23, 2022
f890c8c
fix warning messages in bcs/clsm/*_params.nc4
biljanaorescanin May 25, 2022
d745c08
rename maxcat to n_tile
biljanaorescanin May 25, 2022
9c3baa1
Merge branch 'develop' into rreichle/cleanup/make_bcs
gmao-rreichle May 26, 2022
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
14 changes: 10 additions & 4 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/mkCatchParam.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ PROGRAM mkCatchParam
type (regrid_map) :: maparc30, mapgeoland2,maparc60
character*200 :: tmpstring, tmpstring1, tmpstring2
character*200 :: fname_tmp, fname_tmp2, fname_tmp3, fname_tmp4
integer :: maxcat

! --------- VARIABLES FOR *OPENMP* PARALLEL ENVIRONMENT ------------
!
Expand Down Expand Up @@ -213,9 +214,6 @@ PROGRAM mkCatchParam
write (log_file,'(a)')'Cube-Sphere Grid - assuming dateline-on-edge (DE)'
endif

inquire(file='clsm/catch_params.nc4', exist=file_exists)
if (.not.file_exists) CALL open_landparam_nc4_files

! ******************************************************************************
!
! IMPORTANT: The top-level make_bcs script should not allow this program to
Expand Down Expand Up @@ -244,7 +242,15 @@ PROGRAM mkCatchParam
write (log_file,'(a)')'Skipping step for EASE grid. '
endif
write (log_file,'(a)')' '


open (10, file = 'clsm/catchment.def', form = 'formatted', status = 'old', &
action = 'read')
read (10, *) maxcat
close (10, status = 'keep')

inquire(file='clsm/catch_params.nc4', exist=file_exists)
if (.not.file_exists) CALL open_landparam_nc4_files(maxcat)

! Creating cti_stats.dat
! ----------------------

Expand Down
9 changes: 5 additions & 4 deletions ...GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/mod_process_hres_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5846,11 +5846,12 @@ END SUBROUTINE gimms_clim_ndvi

! --------------------------------------------------------------------------

SUBROUTINE open_landparam_nc4_files
SUBROUTINE open_landparam_nc4_files(maxcat)

implicit none
integer :: NCCatOUTID, NCCatCNOUTID, NCVegOUTID
integer :: STATUS, CellID1, CellID2, CellID3, SubID
integer, intent (in) :: maxcat
integer, dimension(8) :: date_time_values
character (22) :: time_stamp
character (100) :: MYNAME
Expand All @@ -5859,9 +5860,9 @@ SUBROUTINE open_landparam_nc4_files
status = NF_CREATE ('clsm/catchcn_params.nc4', NF_NETCDF4, NCCatCNOUTID) ; VERIFY_(STATUS)
status = NF_CREATE ('clsm/vegdyn.data' , NF_NETCDF4, NCVegOUTID ) ; VERIFY_(STATUS)

status = NF_DEF_DIM(NCCatOUTID , 'tile' , NF_UNLIMITED, CellID1)
status = NF_DEF_DIM(NCCatCNOUTID, 'tile' , NF_UNLIMITED, CellID2)
status = NF_DEF_DIM(NCVegOUTID , 'tile' , NF_UNLIMITED, CellID3)
status = NF_DEF_DIM(NCCatOUTID , 'tile' , maxcat, CellID1)
status = NF_DEF_DIM(NCCatCNOUTID, 'tile' , maxcat, CellID2)
status = NF_DEF_DIM(NCVegOUTID , 'tile' , maxcat, CellID3)
status = NF_DEF_DIM(NCCatCNOUTID, 'unknown_dim2' , 4, SubID)

call DEF_VAR ( NCCatOUTID, CellID1,'OLD_ITY' ,'vegetation_type.' , '1' )
Expand Down