Skip to content

Bring in cam_in/cam_out variables to the registry #402

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
cacraigucar merged 26 commits into from
Jul 30, 2025
Merged

Bring in cam_in/cam_out variables to the registry #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3c2a8ad
Add cam_in variables to registry
cacraigucar May 7, 2025
45de65f
Add cam_out variables
cacraigucar May 8, 2025
f9d2c41
First mods for cam_in/out
cacraigucar May 16, 2025
730ed79
mods to allow cam_in/out to compile
cacraigucar May 21, 2025
d3a829d
Merge remote-tracking branch 'upstream/development' into cam_sima_cam…
cacraigucar May 21, 2025
cfea13b
changes to get the code to compile/run on derecho
cacraigucar May 22, 2025
c169ac9
Merge remote-tracking branch 'upstream/development' into cam_sima_cam…
cacraigucar Jun 26, 2025
112abae
Update cam_in variable standard names
cacraigucar Jun 26, 2025
9ab9bf5
Mods for cam_in/out
cacraigucar Jun 27, 2025
1bac89b
Add _tbd to the end of standard_names which are not finalized
cacraigucar Jun 30, 2025
c857060
final cleanup of standard_names and units for initial PR
cacraigucar Jun 30, 2025
2d6fc07
Change order of dimensions in allocate_physics_types_fields call
cacraigucar Jul 3, 2025
1ef2258
Fix constituent dimension name
cacraigucar Jul 3, 2025
64e3b82
Modify registry generator to bring in dimensions via use statements i…
nusbaume Jul 7, 2025
67cb874
Merge remote-tracking branch 'upstream/development' into cam_sima_cam…
cacraigucar Jul 10, 2025
39759ca
Update atmospheric_physics external
cacraigucar Jul 10, 2025
1139047
Update atmospheric_physics for git-fleximod
cacraigucar Jul 10, 2025
79bbc45
Remove values which are no longer needed when these changes are commi…
cacraigucar Jul 24, 2025
c7b9abb
Update .gitmodules
cacraigucar Jul 24, 2025
5ce540a
Address some of the review comments
cacraigucar Jul 24, 2025
70074e3
Merge remote-tracking branch 'upstream/development' into cam_sima_cam…
cacraigucar Jul 24, 2025
8693f11
fix metadata file which was accidentally reverted
cacraigucar Jul 24, 2025
ddb5d8d
Removed ccpp_constant_four which crept into a number of variables by …
cacraigucar Jul 25, 2025
a7a7ce9
Removed comments on a number of commented out variables into the regi…
cacraigucar Jul 28, 2025
f410257
Remove some unused code
cacraigucar Jul 28, 2025
7eba557
Minor comment change
cacraigucar Jul 28, 2025
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = e92f76351e7f7703fb6d91cb5e76dcbbc6dcb3f2
fxtag = 754a0c28631655289765e99f747c1d96a6d882f4
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "rrtmgp-data"]
Expand Down
11 changes: 1 addition & 10 deletions src/control/cam_comp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module cam_comp
use time_manager, only: is_first_step, is_first_restart_step
use time_manager, only: get_curr_calday

use camsrfexch, only: cam_out_t, cam_in_t
use physics_types, only: cam_out_t, cam_in_t
use physics_types, only: phys_state, phys_tend
use physics_types, only: dtime_phys
use physics_types, only: calday
Expand Down Expand Up @@ -90,7 +90,6 @@ subroutine cam_init(caseid, ctitle, model_doi_url, &
use phys_comp, only: phys_register
use dyn_comp, only: dyn_init
! use cam_restart, only: cam_read_restart
use camsrfexch, only: hub2atm_alloc, atm2hub_alloc
use cam_history, only: history_init_files
! use history_scam, only: scm_intht
use cam_pio_utils, only: init_pio_subsystem
Expand Down Expand Up @@ -232,10 +231,6 @@ subroutine cam_init(caseid, ctitle, model_doi_url, &

call dyn_init(cam_runtime_opts, dyn_in, dyn_out)

! Allocate and setup surface exchange data
call atm2hub_alloc(cam_out)
call hub2atm_alloc(cam_in)

else

!!XXgoldyXX: v need to import this
Expand Down Expand Up @@ -563,7 +558,6 @@ subroutine cam_final(cam_out, cam_in)
use stepon, only: stepon_final
use phys_comp, only: phys_final
use cam_initfiles, only: cam_initfiles_close
use camsrfexch, only: atm2hub_deallocate, hub2atm_deallocate
! use ionosphere_interface, only: ionosphere_final
use cam_control_mod, only: initial_run

Expand All @@ -583,9 +577,6 @@ subroutine cam_final(cam_out, cam_in)
call cam_initfiles_close()
end if

call hub2atm_deallocate(cam_in)
call atm2hub_deallocate(cam_out)

! This flush attempts to ensure that asynchronous diagnostic prints
! from all processes do not get mixed up with the "END OF MODEL RUN"
! message printed by masterproc below. The test-model script
Expand Down
186 changes: 0 additions & 186 deletions src/control/camsrfexch.F90
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/control/camsrfexch.meta
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/cpl/nuopc/atm_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module atm_comp_nuopc
use cam_instance , only : cam_instance_init, inst_suffix, inst_index
use cam_comp , only : cam_init, cam_run1, cam_run2, cam_run3, cam_run4, cam_final
use cam_comp , only : cam_timestep_init, cam_timestep_final
use camsrfexch , only : cam_out_t, cam_in_t
use physics_types , only : cam_out_t, cam_in_t
! use radiation , only : nextsw_cday !uncomment once radiation has been CCPP-ized -JN
use cam_logfile , only : cam_set_log_unit, iulog
use cam_abortutils , only : check_allocate
Expand Down
37 changes: 18 additions & 19 deletions src/cpl/nuopc/atm_import_export.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
! copy from field pointer to CAM-SIMA array data structure
! -----------------------------------------------------

use camsrfexch , only : cam_in_t
use physics_types , only : cam_in_t
use shr_const_mod , only : shr_const_stebol
use shr_sys_mod , only : shr_sys_abort
use nuopc_shr_methods , only : chkerr
Expand Down Expand Up @@ -526,9 +526,6 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
! Required atmosphere input fields
!--------------------------

!Remove once the "cam_in" object has been fully implemented. -JN
#if 0

if (overwrite_flds) then
call state_getfldptr(importState, 'Faxx_taux', fldptr=fldptr_taux, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand All @@ -540,7 +537,7 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
do i = 1, columns_on_task
cam_in%wsx(i) = -fldptr_taux(i) * med2mod_areacor(i)
cam_in%wsy(i) = -fldptr_tauy(g) * med2mod_areacor(i)
cam_in%wsy(i) = -fldptr_tauy(i) * med2mod_areacor(i)
cam_in%shf(i) = -fldptr_sen(i) * med2mod_areacor(i)
cam_in%cflx(i,1) = -fldptr_evap(i) * med2mod_areacor(i)
end do
Expand Down Expand Up @@ -599,6 +596,8 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
cam_in%landfrac(i) = fldptr_lfrac(i)
end do

! Commented out until dimensions and usage are figured out
#if 0
! Optional fields

call state_getfldptr(importState, 'Sl_ram1', fldptr=fldptr1d, exists=exists, rc=rc)
Expand Down Expand Up @@ -676,7 +675,11 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
cam_in%fireztop(i) = fldptr1d(i)
end do
end if
#endif

#if 0
! Ignoring depvel for now as it has a problematic second dimension (number of dry deposited species)
! and it was determined that it probably will not be used in CAM-SIMA for some time
! dry dep velocities
call state_getfldptr(importState, 'Sl_ddvel', fldptr2d=fldptr2d, exists=exists, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand All @@ -687,7 +690,10 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
end do
end do
end if
#endif

#if 0
Comment thread
jimmielin marked this conversation as resolved.
! Commented out until water isotopes or carbon ccle fluxe are implemented in CAM-SIMA
! fields needed to calculate water isotopes to ocean evaporation processes
call state_getfldptr(importState, 'So_ustar', fldptr=fldptr1d, exists=exists, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down Expand Up @@ -806,7 +812,9 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
cam_in%cflx(i,c_i(4)) = cam_in%cflx(i,c_i(1)) + cam_in%cflx(i,c_i(2)) + cam_in%cflx(i,c_i(3))
end do
end do

end if
#endif

! if first step, determine longwave up flux from the surface temperature
if (first_time) then
Expand All @@ -818,9 +826,6 @@ subroutine import_fields( gcomp, cam_in, restart_init, rc)
first_time = .false.
end if

!Remove once the "cam_in" object has been fully implemented. -JN
#endif

end subroutine import_fields

!===============================================================================
Expand All @@ -835,7 +840,7 @@ subroutine export_fields( gcomp, model_mesh, model_clock, cam_out, rc)
use ESMF , only : ESMF_Clock
use nuopc_shr_methods , only : chkerr
use srf_field_check , only : active_Faxa_nhx, active_Faxa_noy
use camsrfexch , only : cam_out_t
use physics_types , only : cam_out_t
use time_manager , only : is_first_step, get_nstep
use physics_grid , only : columns_on_task
use atm_stream_ndep , only : stream_ndep_init, stream_ndep_interp
Expand Down Expand Up @@ -884,9 +889,6 @@ subroutine export_fields( gcomp, model_mesh, model_clock, cam_out, rc)
call NUOPC_ModelGet(gcomp, exportState=exportState, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return

!Remove once the "cam_in" object has been fully implemented. -JN
#if 0

! required export state variables
call state_getfldptr(exportState, 'Sa_topo', fldptr=fldptr_topo, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down Expand Up @@ -947,8 +949,8 @@ subroutine export_fields( gcomp, model_mesh, model_clock, cam_out, rc)
fldptr_swnet(i) = cam_out%netsw(i) * mod2med_areacor(i)
fldptr_snowc(i) = cam_out%precsc(i)*1000._r8 * mod2med_areacor(i)
fldptr_snowl(i) = cam_out%precsl(i)*1000._r8 * mod2med_areacor(i)
fldptr_rainc(i) = (cam_out%precc(i) - cam_out(c)%precsc(i))*1000._r8 * mod2med_areacor(i)
fldptr_rainl(i) = (cam_out%precl(i) - cam_out(c)%precsl(i))*1000._r8 * mod2med_areacor(i)
fldptr_rainc(i) = (cam_out%precc(i) - cam_out%precsc(i))*1000._r8 * mod2med_areacor(i)
fldptr_rainl(i) = (cam_out%precl(i) - cam_out%precsl(i))*1000._r8 * mod2med_areacor(i)
fldptr_soll(i) = cam_out%soll(i) * mod2med_areacor(i)
fldptr_sols(i) = cam_out%sols(i) * mod2med_areacor(i)
fldptr_solld(i) = cam_out%solld(i) * mod2med_areacor(i)
Expand Down Expand Up @@ -1035,13 +1037,10 @@ subroutine export_fields( gcomp, model_mesh, model_clock, cam_out, rc)
scale_ndep = 1._r8
end if
do i = 1, columns_on_task
fldptr_ndep(1,i) = cam_out(c)%nhx_nitrogen_flx(i) * scale_ndep * mod2med_areacor(i)
fldptr_ndep(2,i) = cam_out(c)%noy_nitrogen_flx(i) * scale_ndep * mod2med_areacor(i)
fldptr_ndep(1,i) = cam_out%nhx_nitrogen_flx(i) * scale_ndep * mod2med_areacor(i)
fldptr_ndep(2,i) = cam_out%noy_nitrogen_flx(i) * scale_ndep * mod2med_areacor(i)
end do

!Remove once the "cam_in" object has been fully implemented. -JN
#endif

end subroutine export_fields

!===============================================================================
Expand Down
Loading