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

Wrapper PR for #261, #271, #268: zorl interstitial, ocn -> wat, merra2 threading #279

Merged
merged 26 commits into from
Apr 15, 2021
Merged

Wrapper PR for #261, #271, #268: zorl interstitial, ocn -> wat, merra2 threading #279

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
69d0772
changed .gitmodules to point to merra2 ccpp/physics
AnningCheng-NOAA Mar 5, 2021
90b66b5
resloved conflict by adding ccpp-physics
AnningCheng-NOAA Mar 8, 2021
30051d5
remove GFDL_atmos_cubed_sphere and ccpp-framework from .git module
AnningCheng-NOAA Mar 16, 2021
fab43ee
Merge remote-tracking branch 'upstream/develop' into merra2
AnningCheng-NOAA Mar 16, 2021
dbc9d70
remove IPD gfsphysics
AnningCheng-NOAA Mar 16, 2021
1b633bf
.gitmodules update
AnningCheng-NOAA Mar 16, 2021
92bb787
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Mar 17, 2021
82a5bfb
Remove interstitial zorl composites
climbfuji Mar 17, 2021
a97db9b
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into rem…
climbfuji Mar 17, 2021
8f3796e
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into rem…
climbfuji Mar 18, 2021
99eddab
Update .gitmodules and submodule pointer fpor ccpp-physics for code r…
climbfuji Apr 2, 2021
a318f8c
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into thr…
climbfuji Apr 2, 2021
7e4532d
Remove or replace references to IPD in comments in atmos_model.F90
climbfuji Apr 2, 2021
6c0cc1d
Initialize Sfcprop%zorlx to clear_val instead of huge
climbfuji Apr 2, 2021
927dc21
Update submodule pointer for ccpp-physics
climbfuji Apr 2, 2021
1613a3a
Update submodule pointer for ccpp-physics
climbfuji Apr 2, 2021
ba4370e
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into rem…
climbfuji Apr 2, 2021
f5401dd
Rename Fortran variables and CCPP standard names / long names of surf…
climbfuji Apr 5, 2021
924fe47
Rename Sfcprop%zorlw to Sfcprop%zorlwav
climbfuji Apr 5, 2021
f46a7d8
Merge branch 'remove_zorl_interstitial' of https://github.com/climbfu…
climbfuji Apr 5, 2021
b5661d0
Rename Sfcprop%zorlo to Sfcprop%zorlw
climbfuji Apr 5, 2021
b9d743b
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into thr…
climbfuji Apr 9, 2021
91df567
update submodule pointer for ccpp-physics
climbfuji Apr 9, 2021
c987ae0
Merge branch 'threading_aerosol_interp_noahmp_init' of https://github…
climbfuji Apr 14, 2021
8be8145
Merge branch 'rename_surface_composites_ocean_water' of https://githu…
climbfuji Apr 14, 2021
9039290
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 15, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@
branch = master
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = master
#url = https://github.com/NCAR/ccpp-physics
#branch = master
url = https://github.com/climbfuji/ccpp-physics
branch = zorl_ocnwat_merra2_combined
24 changes: 12 additions & 12 deletions atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ subroutine update_atmos_radiation_physics (Atmos)
jdat(5), jdat(6), jdat(7))
GFS_control%jdat(:) = jdat(:)

!--- execute the IPD atmospheric setup step
!--- execute the atmospheric setup step
call mpp_clock_begin(setupClock)
call CCPP_step (step="timestep_init", nblks=Atm_block%nblks, ierr=ierr)
if (ierr/=0) call mpp_error(FATAL, 'Call to CCPP timestep_init step failed')
Expand All @@ -279,8 +279,8 @@ subroutine update_atmos_radiation_physics (Atmos)

endif

! Calculate total non-physics tendencies by substracting old IPD Stateout
! variables from new/updated IPD Statein variables (gives the tendencies
! Calculate total non-physics tendencies by substracting old GFS Stateout
! variables from new/updated GFS Statein variables (gives the tendencies
! due to anything else than physics)
if (GFS_control%ldiag3d) then
do nb = 1,Atm_block%nblks
Expand All @@ -305,7 +305,7 @@ subroutine update_atmos_radiation_physics (Atmos)

if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "radiation driver"

!--- execute the IPD atmospheric radiation subcomponent (RRTM)
!--- execute the atmospheric radiation subcomponent (RRTM)

call mpp_clock_begin(radClock)
! Performance improvement. Only enter if it is time to call the radiation physics.
Expand All @@ -322,7 +322,7 @@ subroutine update_atmos_radiation_physics (Atmos)

if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "physics driver"

!--- execute the IPD atmospheric physics step1 subcomponent (main physics driver)
!--- execute the atmospheric physics step1 subcomponent (main physics driver)

call mpp_clock_begin(physClock)
call CCPP_step (step="physics", nblks=Atm_block%nblks, ierr=ierr)
Expand All @@ -336,7 +336,7 @@ subroutine update_atmos_radiation_physics (Atmos)

if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "stochastic physics driver"

!--- execute the IPD atmospheric physics step2 subcomponent (stochastic physics driver)
!--- execute the atmospheric physics step2 subcomponent (stochastic physics driver)

call mpp_clock_begin(physClock)
call CCPP_step (step="stochastics", nblks=Atm_block%nblks, ierr=ierr)
Expand All @@ -350,7 +350,7 @@ subroutine update_atmos_radiation_physics (Atmos)
call getiauforcing(GFS_control,IAU_data)
if (mpp_pe() == mpp_root_pe() .and. debug) write(6,*) "end of radiation and physics step"

!--- execute the IPD atmospheric timestep finalize step
!--- execute the atmospheric timestep finalize step
call mpp_clock_begin(setupClock)
call CCPP_step (step="timestep_finalize", nblks=Atm_block%nblks, ierr=ierr)
if (ierr/=0) call mpp_error(FATAL, 'Call to CCPP timestep_finalize step failed')
Expand Down Expand Up @@ -502,7 +502,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
do i = 1, ntracers
call get_tracer_names(MODEL_ATMOS, i, tracer_names(i))
enddo
!--- setup IPD Init_parm
!--- setup Init_parm
Init_parm%me = mpp_pe()
Init_parm%master = mpp_root_pe()
Init_parm%tile_num = tile_num
Expand Down Expand Up @@ -669,7 +669,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)

!if in coupled mode, set up coupled fields
if (GFS_control%cplflx .or. GFS_control%cplwav) then
if (mpp_pe() == mpp_root_pe()) print *,'COUPLING: IPD layer'
if (mpp_pe() == mpp_root_pe()) print *,'COUPLING: CCPP layer'
call setup_exportdata(ierr)
endif

Expand Down Expand Up @@ -888,7 +888,7 @@ subroutine atmos_model_end (Atmos)
call stochastic_physics_wrapper_end(GFS_control)

! Fast physics (from dynamics) are finalized in atmosphere_end above;
! standard/slow physics (from IPD) are finalized in CCPP_step 'finalize'.
! standard/slow physics (from CCPP) are finalized in CCPP_step 'finalize'.
! The CCPP framework for all cdata structures is finalized in CCPP_step 'finalize'.
call CCPP_step (step="finalize", nblks=Atm_block%nblks, ierr=ierr)
if (ierr/=0) call mpp_error(FATAL, 'Call to CCPP finalize step failed')
Expand Down Expand Up @@ -1614,10 +1614,10 @@ subroutine assign_importdata(rc)
if (GFS_data(nb)%Sfcprop%oceanfrac(ix) > zero .and. datar8(i,j) > zorlmin) then
tem = 100.0_GFS_kind_phys * min(0.1_GFS_kind_phys, datar8(i,j))
! GFS_data(nb)%Coupling%zorlwav_cpl(ix) = tem
GFS_data(nb)%Sfcprop%zorlo(ix) = tem
GFS_data(nb)%Sfcprop%zorlw(ix) = tem
GFS_data(nb)%Sfcprop%zorlwav(ix) = tem
else
GFS_data(nb)%Sfcprop%zorlw(ix) = -999.0_GFS_kind_phys
GFS_data(nb)%Sfcprop%zorlwav(ix) = -999.0_GFS_kind_phys

endif
enddo
Expand Down
Loading