Skip to content

remove shr_mpi_mod #203

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
jedwards4b merged 13 commits into from
Dec 29, 2022
Merged

remove shr_mpi_mod #203

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
723fb46
try -Werror option to gfortran
jedwards4b Dec 28, 2022
e2fad33
remove shr_mpi_mod - wip
jedwards4b Dec 28, 2022
7d141a7
remove shr_mpi and replace with ESMF_VM
jedwards4b Dec 28, 2022
4f6b338
remove shr_mpi from shr_abort
jedwards4b Dec 28, 2022
2c36d91
datm complete
jedwards4b Dec 28, 2022
42668e6
more shr_mpi replacements
jedwards4b Dec 28, 2022
88435ee
more shr_mpi replacements
jedwards4b Dec 28, 2022
b088344
more shr_mpi replacements
jedwards4b Dec 28, 2022
4604bca
more shr_mpi replacements
jedwards4b Dec 28, 2022
eb5de04
remove last shr_mpi calls
jedwards4b Dec 28, 2022
155427a
get constant name correct
jedwards4b Dec 28, 2022
12b81e9
get constant name correct
jedwards4b Dec 28, 2022
5922496
now compiles
jedwards4b Dec 29, 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
2 changes: 1 addition & 1 deletion .github/workflows/extbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ jobs:
export SRC_ROOT=
mkdir build-cdeps
pushd build-cdeps
cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-DCPRGNU -g -Wall -ffree-form -ffree-line-length-none -fallow-argument-mismatch " ../
cmake -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-DCPRGNU -g -Wall -Werror -ffree-form -ffree-line-length-none -fallow-argument-mismatch " ../
make VERBOSE=1
popd
79 changes: 57 additions & 22 deletions datm/atm_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module cdeps_datm_comp
use ESMF , only : ESMF_Time, ESMF_Alarm, ESMF_TimeGet, ESMF_TimeInterval
use ESMF , only : operator(+), ESMF_TimeIntervalGet, ESMF_ClockGetAlarm
use ESMF , only : ESMF_AlarmIsRinging, ESMF_AlarmRingerOff, ESMF_StateGet
use ESMF , only : ESMF_FieldGet, ESMF_MAXSTR
use ESMF , only : ESMF_FieldGet, ESMF_MAXSTR, ESMF_VMBroadcast
use ESMF , only : ESMF_TraceRegionEnter, ESMF_TraceRegionExit
use NUOPC , only : NUOPC_CompDerive, NUOPC_CompSetEntryPoint, NUOPC_CompSpecialize
use NUOPC , only : NUOPC_CompAttributeGet, NUOPC_Advertise
Expand All @@ -28,7 +28,6 @@ module cdeps_datm_comp
use shr_const_mod , only : shr_const_cday
use shr_sys_mod , only : shr_sys_abort
use shr_cal_mod , only : shr_cal_ymd2date
use shr_mpi_mod , only : shr_mpi_bcast
use shr_log_mod , only : shr_log_setLogUnit
use dshr_methods_mod , only : dshr_state_diagnose, chkerr, memcheck
use dshr_strdata_mod , only : shr_strdata_type, shr_strdata_init_from_config, shr_strdata_advance
Expand Down Expand Up @@ -222,17 +221,32 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
integer :: nu ! unit number
integer :: ierr ! error code
logical :: exists ! check for file existence
integer :: bcasttmp(9)
type(EMSF_VM) :: vm
character(len=*),parameter :: subname=trim(modName) // ':(InitializeAdvertise) '
character(*) ,parameter :: F00 = "('(" // trim(modName) // ") ',8a)"
character(*) ,parameter :: F01 = "('(" // trim(modName) // ") ',a,2x,i8)"
character(*) ,parameter :: F02 = "('(" // trim(modName) // ") ',a,l6)"
!-------------------------------------------------------------------------------

namelist / datm_nml / datamode, &
model_meshfile, model_maskfile, &
nx_global, ny_global, restfilm, iradsw, factorFn_data, factorFn_mesh, &
flds_presaero, flds_co2, flds_wiso, bias_correct, anomaly_forcing, &
skip_restart_read, flds_presndep, flds_preso3
namelist / datm_nml / &
datamode, &
model_meshfile,
model_maskfile, &
nx_global, &
ny_global, &
restfilm, &
iradsw, &
factorFn_data, &
factorFn_mesh, &
flds_presaero, &
flds_co2, &
flds_wiso, &
bias_correct, &
anomaly_forcing, &
skip_restart_read, &
flds_presndep, &
flds_preso3

rc = ESMF_SUCCESS

Expand All @@ -259,23 +273,44 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
write(logunit,*) 'ERROR: reading input namelist, '//trim(nlfilename)//' iostat=',ierr
call shr_sys_abort(subName//': namelist read error '//trim(nlfilename))
end if
bcasttmp = 0
bcasttmp(1) = nx_global
bcasttmp(2) = ny_global
bcasttmp(3) = iradsw
if(flds_presaero) bcasttmp(4) = 1
if(flds_presndep) bcasttmp(5) = 1
if(flds_preso3) bcasttmp(6) = 1
if(flds_co2) bcasttmp(7) = 1
if(flds_wiso) bcasttmp(8) = 1
if(skip_restart_read) bcasttmp(9) = 1

end if
call ESMF_GridCompGet(gcomp, vm=vm, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return

call shr_mpi_bcast(datamode , mpicom, 'datamode')
call shr_mpi_bcast(model_meshfile , mpicom, 'model_meshfile')
call shr_mpi_bcast(model_maskfile , mpicom, 'model_maskfile')
call shr_mpi_bcast(nx_global , mpicom, 'nx_global')
call shr_mpi_bcast(ny_global , mpicom, 'ny_global')
call shr_mpi_bcast(iradsw , mpicom, 'iradsw')
call shr_mpi_bcast(factorFn_data , mpicom, 'factorFn_data')
call shr_mpi_bcast(factorFn_mesh , mpicom, 'factorFn_mesh')
call shr_mpi_bcast(restfilm , mpicom, 'restfilm')
call shr_mpi_bcast(flds_presaero , mpicom, 'flds_presaero')
call shr_mpi_bcast(flds_presndep , mpicom, 'flds_presndep')
call shr_mpi_bcast(flds_preso3 , mpicom, 'flds_preso3')
call shr_mpi_bcast(flds_co2 , mpicom, 'flds_co2')
call shr_mpi_bcast(flds_wiso , mpicom, 'flds_wiso')
call shr_mpi_bcast(skip_restart_read , mpicom, 'skip_restart_read')
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, factorFn_data, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, factorFn_mesh, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, bcasttmp, 9, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
nx_global = bcasttmp(1)
ny_global = bcasttmp(2)
iradsw = bcasttmp(3)
flds_presaero = (bcasttmp(4) == 1)
flds_presndep = (bcasttmp(5) == 1)
flds_preso3 = (bcasttmp(6) == 1)
flds_co2 = (bcasttmp(7) == 1)
flds_wiso = (bcasttmp(8) == 1)
skip_restart_read = (bcasttmp(9) == 1)

! write namelist input to standard out
if (my_task == main_task) then
Expand Down
1 change: 0 additions & 1 deletion share/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ add_library(cdeps_share ${GenF90_SRCS}
shr_abort_mod.F90
shr_const_mod.F90
shr_orb_mod.F90
shr_mpi_mod.F90
shr_log_mod.F90
shr_strconvert_mod.F90
shr_precip_mod.F90
Expand Down
Loading