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

JCSDA development without the adjoint changes #807

Merged
merged 8 commits into from
Sep 21, 2021
Merged

JCSDA development without the adjoint changes #807

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8df702
JCSDA changes
danholdaway Jul 23, 2021
2c78472
Merge branch 'main' into dev/jcsda
danholdaway Jul 23, 2021
1c984eb
Remove trailing whitespace in mpp/include/mpp_do_update_ad.h
danholdaway Jul 26, 2021
d6e52d0
Merge branch 'dev/jcsda' of https://github.com/jcsda/fms into dev/jcsda
danholdaway Jul 26, 2021
cc19220
Merge branch 'main' into dev/jcsda
danholdaway Aug 3, 2021
b187763
Merge branch 'main' into dev/jcsda
danholdaway Sep 2, 2021
98185e1
revert adjoint
danholdaway Sep 2, 2021
b8158cd
reduce max_domains
danholdaway Sep 7, 2021
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
2 changes: 1 addition & 1 deletion field_manager/field_manager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ module field_manager_mod
!> The length of a character string representing the field path.
integer, parameter, public :: fm_path_name_len = 512
!> The length of a character string representing character values for the field.
integer, parameter, public :: fm_string_len = 128
integer, parameter, public :: fm_string_len = 1024
!> The length of a character string representing the various types that the values of the field can take.
integer, parameter, public :: fm_type_name_len = 8
!> Number of models (ATMOS, OCEAN, LAND, ICE, COUPLER).
Expand Down
16 changes: 11 additions & 5 deletions fms/fms_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ module fms_io_mod
integer, parameter, private :: max_fields=400
integer, parameter, private :: max_axes=40
integer, parameter, private :: max_atts=20
integer, parameter, private :: max_domains = 10
integer, parameter, private :: max_domains = 1000
danholdaway marked this conversation as resolved.
Show resolved Hide resolved
integer, parameter, private :: MAX_TIME_LEVEL_REGISTER = 2
integer, parameter, private :: MAX_TIME_LEVEL_WRITE = 20
integer, parameter :: max_axis_size=10000
Expand Down Expand Up @@ -712,8 +712,9 @@ subroutine fms_io_init()
end select

! Initially allocate files_write and files_read
allocate(files_write(max_files_w),files_read(max_files_r))
allocate(registered_file(max_files_w))
if (.not. allocated(files_write) ) allocate(files_write(max_files_w))
if (.not. allocated(files_read) ) allocate(files_read(max_files_r))
if (.not. allocated(registered_file)) allocate(registered_file(max_files_w))

do i = 1, max_domains
array_domain(i) = NULL_DOMAIN2D
Expand Down Expand Up @@ -7895,11 +7896,12 @@ end subroutine get_mosaic_tile_file_ug


!#############################################################################
subroutine get_mosaic_tile_grid(grid_file, mosaic_file, domain, tile_count)
subroutine get_mosaic_tile_grid(grid_file, mosaic_file, domain, tile_count, custom_path)
character(len=*), intent(out) :: grid_file
character(len=*), intent(in) :: mosaic_file
type(domain2D), intent(in) :: domain
integer, intent(in), optional :: tile_count
character(len=*), intent(in), optional :: custom_path
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a doxygen description of this new variable per the style guide functions section

"Inline doxygen descriptions for all arguments, except the result variable."

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do. We'll have another PR coming up so will add it then.

integer :: tile, ntileMe
integer, dimension(:), allocatable :: tile_id

Expand All @@ -7909,7 +7911,11 @@ subroutine get_mosaic_tile_grid(grid_file, mosaic_file, domain, tile_count)
allocate(tile_id(ntileMe))
tile_id = mpp_get_tile_id(domain)
call read_data(mosaic_file, "gridfiles", grid_file, level=tile_id(tile) )
grid_file = 'INPUT/'//trim(grid_file)
if (.not. present(custom_path)) then
grid_file = 'INPUT/'//trim(grid_file)
else
grid_file = trim(custom_path)//'/'//trim(grid_file)
endif
bensonr marked this conversation as resolved.
Show resolved Hide resolved
deallocate(tile_id)

end subroutine get_mosaic_tile_grid
Expand Down
2 changes: 1 addition & 1 deletion tracer_manager/tracer_manager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ module tracer_manager_mod
!> @{

integer :: num_tracer_fields = 0
integer, parameter :: MAX_TRACER_FIELDS = 150
integer, parameter :: MAX_TRACER_FIELDS = 250
integer, parameter :: MAX_TRACER_METHOD = 20
integer, parameter :: NO_TRACER = 1-HUGE(1)
integer, parameter :: NOTRACER = -HUGE(1)
Expand Down