Skip to content

Added Parallel processing support with prereq for manage_regression_s… #588

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

Closed
jamilgafur wants to merge 1 commit into from
Closed

Added Parallel processing support with prereq for manage_regression_s… #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ src/operators/*.f90

# All object files
*.o
*~

# All mod files
*.mod
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "src/core_ocean/cvmix"]
path = src/core_ocean/cvmix
url = git@github.com:CVMix/CVMix-src.git
[submodule "src/core_ocean/BGC"]
path = src/core_ocean/BGC
url = git@github.com:E3SM-Project/Ocean-BGC.git
18 changes: 5 additions & 13 deletions src/core_atmosphere/mpas_atm_core.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function atm_core_init(domain, startTimeStamp) result(ierr)
real (kind=RKIND), pointer :: dt
type (block_type), pointer :: block

integer :: i
logical, pointer :: config_do_restart

type (mpas_pool_type), pointer :: state
Expand Down Expand Up @@ -201,8 +200,8 @@ subroutine atm_simulation_clock_init(core_clock, configs, ierr)
type (mpas_pool_type), intent(inout) :: configs
integer, intent(out) :: ierr

type (MPAS_Time_Type) :: startTime, stopTime, alarmStartTime
type (MPAS_TimeInterval_type) :: runDuration, timeStep, alarmTimeStep
type (MPAS_Time_Type) :: startTime, stopTime
type (MPAS_TimeInterval_type) :: runDuration, timeStep
integer :: local_err
real (kind=RKIND), pointer :: config_dt
character (len=StrKIND), pointer :: config_start_time
Expand Down Expand Up @@ -288,7 +287,6 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)

real (kind=RKIND), dimension(:,:), pointer :: u, uReconstructX, uReconstructY, uReconstructZ, uReconstructZonal, uReconstructMeridional
real (kind=RKIND), dimension(:), pointer :: meshScalingDel2, meshScalingDel4
real (kind=RKIND), dimension(:), pointer :: meshScalingRegionalCell, meshScalingRegionalEdge
real (kind=RKIND), dimension(:), pointer :: areaCell, invAreaCell
real (kind=RKIND), dimension(:), pointer :: dvEdge, invDvEdge
real (kind=RKIND), dimension(:), pointer :: dcEdge, invDcEdge
Expand Down Expand Up @@ -504,9 +502,6 @@ function atm_core_run(domain) result(ierr)

type (mpas_pool_type), pointer :: state, diag, mesh, diag_physics, tend, tend_physics

! For high-frequency diagnostics output
character (len=StrKIND) :: tempfilename

! For timing information
real (kind=R8KIND) :: integ_start_time, integ_stop_time
real (kind=R8KIND) :: diag_start_time, diag_stop_time
Expand Down Expand Up @@ -722,9 +717,8 @@ function atm_core_run(domain) result(ierr)
block_ptr => domain % blocklist
do while (associated(block_ptr))

call mpas_pool_get_subpool(block_ptr % structs, 'diag', diag)
call mpas_pool_get_subpool(block_ptr % structs, 'diag_physics', diag_physics)
call atm_reset_diagnostics(diag, diag_physics)
call atm_reset_diagnostics(diag_physics)

block_ptr => block_ptr % next
end do
Expand Down Expand Up @@ -802,19 +796,17 @@ subroutine atm_compute_output_diagnostics(state, time_lev, diag, mesh)
end subroutine atm_compute_output_diagnostics


subroutine atm_reset_diagnostics(diag, diag_physics)
subroutine atm_reset_diagnostics(diag_physics)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! reset some diagnostics after output
!
! Input: diag - contains dynamics diagnostic fields
! daig_physics - contains physics diagnostic fields
! Input: diag_physics - contains physics diagnostic fields
!
! Output: whatever diagnostics need resetting after output
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

implicit none

type (mpas_pool_type), intent(inout) :: diag
type (mpas_pool_type), intent(inout) :: diag_physics

real (kind=RKIND), dimension(:), pointer :: refl10cm_1km_max
Expand Down
11 changes: 9 additions & 2 deletions src/core_init_atmosphere/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ OBJS = \
mpas_atmphys_date_time.o \
mpas_atmphys_functions.o \
mpas_atmphys_initialize_real.o \
mpas_atmphys_utilities.o
mpas_atmphys_utilities.o

all: core_hyd

Expand Down Expand Up @@ -66,17 +66,24 @@ mpas_init_atm_read_met.o:

read_geogrid.o:

mpas_kd_tree.o:

mpas_init_atm_llxy.o:

mpas_init_atm_core_interface.o: mpas_init_atm_core.o

mpas_init_atm_core.o: mpas_advection.o mpas_init_atm_cases.o

mpas_stack.o:

mpas_parse_geoindex.o:

mpas_init_atm_static.o: \
mpas_atm_advection.o \
mpas_init_atm_hinterp.o \
mpas_init_atm_llxy.o \
mpas_atmphys_utilities.o
mpas_atmphys_utilities.o \
mpas_stack.o

mpas_init_atm_surface.o: \
mpas_init_atm_hinterp.o \
Expand Down
Loading