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

Dev/jcsda #35

Closed
wants to merge 4 commits into from
Closed

Dev/jcsda #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2546118
publicise remap methods
danholdaway Aug 21, 2020
0d70659
make source public and deg2rad defined in header
danholdaway Aug 25, 2020
03e6fd6
remove where deg2rad is set
danholdaway Aug 25, 2020
00b0fb8
Fix '' to be 'Inline' for grid_file
CoryMartin-NOAA Jul 6, 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
9 changes: 3 additions & 6 deletions tools/external_ic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,11 @@ module external_ic_mod

real, parameter:: zvir = rvgas/rdgas - 1.
real(kind=R_GRID), parameter :: cnst_0p20=0.20d0
real :: deg2rad
character (len = 80) :: source ! This tells what the input source was for the data
real, parameter :: deg2rad = pi/180.
character (len = 80), public :: source ! This tells what the input source was for the data
Copy link
Collaborator

Choose a reason for hiding this comment

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

You've made source public, but I don't see any other code using that information.

character(len=27), parameter :: source_fv3gfs = 'FV3GFS GAUSSIAN NEMSIO FILE'
public get_external_ic, get_cubed_sphere_terrain
public remap_scalar, remap_dwinds
Copy link
Collaborator

Choose a reason for hiding this comment

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

You've made remap_scalar and remap_dwinds public, but none of your other code changes use these routines.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@bensonr yes these are being used outside of the dycore, in the JEDI data assimilation system. We have cases where we need to read cold starts in the data assimilation but cannot use the full dycore initialization routines. So we read the cold starts using our own routines that access FMS directly and then call the remapping methods. We may also have cases in the future where we want to remap a state, for example after adding the increment and these routines could be useful there.


! version number of this module
! Include variable "version" to be written to log file.
Expand Down Expand Up @@ -997,8 +998,6 @@ subroutine get_ncep_ic( Atm, fv_domain, nq )
jsd = Atm%bd%jsd
jed = Atm%bd%jed

deg2rad = pi/180.

npz = Atm%npz
call get_number_tracers(MODEL_ATMOS, num_tracers=ntracers, num_prog=ntprog)
if(is_master()) write(*,*) 'ntracers = ', ntracers, 'ntprog = ',ntprog
Expand Down Expand Up @@ -1562,8 +1561,6 @@ subroutine get_ecmwf_ic( Atm, fv_domain )
jsd = Atm%bd%jsd
jed = Atm%bd%jed

deg2rad = pi/180.

npz = Atm%npz
call get_number_tracers(MODEL_ATMOS, num_tracers=ntracers, num_prog=ntprog)
if(is_master()) write(*,*) 'ntracers = ', ntracers, 'ntprog = ',ntprog
Expand Down
6 changes: 3 additions & 3 deletions tools/fv_grid_tools.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ subroutine init_grid(Atm, grid_name, grid_file, npx, npy, npz, ndims, nregions,

if (Atm%neststruct%nested .or. ANY(Atm%neststruct%child_grids)) then
grid_global => Atm%grid_global
else if( trim(grid_file) .NE. 'INPUT/grid_spec.nc') then
else if( trim(grid_file) .EQ. 'Inline') then
allocate(grid_global(1-ng:npx +ng,1-ng:npy +ng,ndims,1:nregions))
endif

Expand Down Expand Up @@ -683,7 +683,7 @@ subroutine init_grid(Atm, grid_name, grid_file, npx, npy, npz, ndims, nregions,
! still need to set up
call setup_aligned_nest(Atm)
else
if(trim(grid_file) == 'INPUT/grid_spec.nc') then
if(trim(grid_file) .NE. 'Inline') then
call read_grid(Atm, grid_file, ndims, nregions, ng)
else
if (Atm%flagstruct%grid_type>=0) call gnomonic_grids(Atm%flagstruct%grid_type, npx-1, xs, ys)
Expand Down Expand Up @@ -1181,7 +1181,7 @@ subroutine init_grid(Atm, grid_name, grid_file, npx, npy, npz, ndims, nregions,

if (Atm%neststruct%nested .or. ANY(Atm%neststruct%child_grids)) then
nullify(grid_global)
else if( trim(grid_file) .NE. 'INPUT/grid_spec.nc') then
else if( trim(grid_file) .EQ. 'Inline') then
deallocate(grid_global)
endif

Expand Down