Skip to content

Commit 3978265

Browse files
grantfirlgrantfirl
committed
Merge branch 'ufs/dev' into feature/ccpp_framework_update
2 parents 3e891cd + a78d06b commit 3978265

2 files changed

Lines changed: 1 addition & 274 deletions

File tree

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90‎

Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -986,89 +986,10 @@ module GFS_interstitialtoscreen
986986

987987
private
988988

989-
public GFS_interstitialtoscreen_init, GFS_interstitialtoscreen_timestep_init, GFS_interstitialtoscreen_run
989+
public GFS_interstitialtoscreen_run
990990

991991
contains
992992

993-
!> \section arg_table_GFS_interstitialtoscreen_init Argument Table
994-
!! \htmlinclude GFS_interstitialtoscreen_init.html
995-
!!
996-
subroutine GFS_interstitialtoscreen_init (Model, Statein, Stateout, Sfcprop, Coupling, &
997-
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial, &
998-
errmsg, errflg)
999-
1000-
implicit none
1001-
1002-
!--- interface variables
1003-
type(GFS_control_type), intent(in) :: Model
1004-
type(GFS_statein_type), intent(in) :: Statein
1005-
type(GFS_stateout_type), intent(in) :: Stateout
1006-
type(GFS_sfcprop_type), intent(in) :: Sfcprop
1007-
type(GFS_coupling_type), intent(in) :: Coupling
1008-
type(GFS_grid_type), intent(in) :: Grid
1009-
type(GFS_tbd_type), intent(in) :: Tbd
1010-
type(GFS_cldprop_type), intent(in) :: Cldprop
1011-
type(GFS_radtend_type), intent(in) :: Radtend
1012-
type(GFS_diag_type), intent(in) :: Diag
1013-
type(GFS_interstitial_type), intent(in) :: Interstitial(:)
1014-
character(len=*), intent(out) :: errmsg
1015-
integer, intent(out) :: errflg
1016-
1017-
!--- local variables
1018-
integer :: i
1019-
1020-
! Initialize CCPP error handling variables
1021-
errmsg = ''
1022-
errflg = 0
1023-
1024-
do i=1,size(Interstitial)
1025-
call GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, &
1026-
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial(i), &
1027-
size(Interstitial), -999, errmsg, errflg)
1028-
end do
1029-
1030-
end subroutine GFS_interstitialtoscreen_init
1031-
1032-
!> \section arg_table_GFS_interstitialtoscreen_timestep_init Argument Table
1033-
!! \htmlinclude GFS_interstitialtoscreen_timestep_init.html
1034-
!!
1035-
subroutine GFS_interstitialtoscreen_timestep_init (Model, Statein, Stateout, Sfcprop, Coupling, &
1036-
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial, &
1037-
errmsg, errflg)
1038-
1039-
implicit none
1040-
1041-
!--- interface variables
1042-
type(GFS_control_type), intent(in) :: Model
1043-
type(GFS_statein_type), intent(in) :: Statein
1044-
type(GFS_stateout_type), intent(in) :: Stateout
1045-
type(GFS_sfcprop_type), intent(in) :: Sfcprop
1046-
type(GFS_coupling_type), intent(in) :: Coupling
1047-
type(GFS_grid_type), intent(in) :: Grid
1048-
type(GFS_tbd_type), intent(in) :: Tbd
1049-
type(GFS_cldprop_type), intent(in) :: Cldprop
1050-
type(GFS_radtend_type), intent(in) :: Radtend
1051-
type(GFS_diag_type), intent(in) :: Diag
1052-
type(GFS_interstitial_type), intent(in) :: Interstitial(:)
1053-
character(len=*), intent(out) :: errmsg
1054-
integer, intent(out) :: errflg
1055-
1056-
!--- local variables
1057-
integer :: i
1058-
1059-
! Initialize CCPP error handling variables
1060-
errmsg = ''
1061-
errflg = 0
1062-
1063-
1064-
do i=1,size(Interstitial)
1065-
call GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, &
1066-
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial(i), &
1067-
size(Interstitial), -999, errmsg, errflg)
1068-
end do
1069-
1070-
end subroutine GFS_interstitialtoscreen_timestep_init
1071-
1072993
!> \section arg_table_GFS_interstitialtoscreen_run Argument Table
1073994
!! \htmlinclude GFS_interstitialtoscreen_run.html
1074995
!!

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta‎

Lines changed: 0 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -314,200 +314,6 @@
314314
type = scheme
315315
dependencies = ../../hooks/machine.F
316316

317-
########################################################################
318-
[ccpp-arg-table]
319-
name = GFS_interstitialtoscreen_init
320-
type = scheme
321-
[Model]
322-
standard_name = GFS_control_type_instance
323-
long_name = instance of derived type GFS_control_type in FV3
324-
units = DDT
325-
dimensions = ()
326-
type = GFS_control_type
327-
intent = in
328-
[Statein]
329-
standard_name = GFS_statein_type_instance
330-
long_name = prognostic state data in from dycore
331-
units = DDT
332-
dimensions = ()
333-
type = GFS_statein_type
334-
intent = in
335-
[Stateout]
336-
standard_name = GFS_stateout_type_instance
337-
long_name = prognostic state or tendencies return to dycore
338-
units = DDT
339-
dimensions = ()
340-
type = GFS_stateout_type
341-
intent = in
342-
[Sfcprop]
343-
standard_name = GFS_sfcprop_type_instance
344-
long_name = instance of derived type GFS_sfcprop_type
345-
units = DDT
346-
dimensions = ()
347-
type = GFS_sfcprop_type
348-
intent = in
349-
[Coupling]
350-
standard_name = GFS_coupling_type_instance
351-
long_name = instance of derived type GFS_coupling_type
352-
units = DDT
353-
dimensions = ()
354-
type = GFS_coupling_type
355-
intent = in
356-
[Grid]
357-
standard_name = GFS_grid_type_instance
358-
long_name = instance of derived type GFS_grid_type
359-
units = DDT
360-
dimensions = ()
361-
type = GFS_grid_type
362-
intent = in
363-
[Tbd]
364-
standard_name = GFS_tbd_type_instance
365-
long_name = instance of derived type GFS_tbd_type
366-
units = DDT
367-
dimensions = ()
368-
type = GFS_tbd_type
369-
intent = in
370-
[Cldprop]
371-
standard_name = GFS_cldprop_type_instance
372-
long_name = instance of derived type GFS_cldprop_type
373-
units = DDT
374-
dimensions = ()
375-
type = GFS_cldprop_type
376-
intent = in
377-
[Radtend]
378-
standard_name = GFS_radtend_type_instance
379-
long_name = instance of derived type GFS_radtend_type
380-
units = DDT
381-
dimensions = ()
382-
type = GFS_radtend_type
383-
intent = in
384-
[Diag]
385-
standard_name = GFS_diag_type_instance
386-
long_name = instance of derived type GFS_diag_type
387-
units = DDT
388-
dimensions = ()
389-
type = GFS_diag_type
390-
intent = in
391-
[Interstitial]
392-
standard_name = GFS_interstitial_type_instance_all_threads
393-
long_name = instance of derived type GFS_interstitial_type
394-
units = DDT
395-
dimensions = (number_of_openmp_threads)
396-
type = GFS_interstitial_type
397-
intent = in
398-
[errmsg]
399-
standard_name = ccpp_error_message
400-
long_name = error message for error handling in CCPP
401-
units = none
402-
dimensions = ()
403-
type = character
404-
kind = len=*
405-
intent = out
406-
[errflg]
407-
standard_name = ccpp_error_code
408-
long_name = error code for error handling in CCPP
409-
units = 1
410-
dimensions = ()
411-
type = integer
412-
intent = out
413-
414-
########################################################################
415-
[ccpp-arg-table]
416-
name = GFS_interstitialtoscreen_timestep_init
417-
type = scheme
418-
[Model]
419-
standard_name = GFS_control_type_instance
420-
long_name = instance of derived type GFS_control_type in FV3
421-
units = DDT
422-
dimensions = ()
423-
type = GFS_control_type
424-
intent = in
425-
[Statein]
426-
standard_name = GFS_statein_type_instance
427-
long_name = prognostic state data in from dycore
428-
units = DDT
429-
dimensions = ()
430-
type = GFS_statein_type
431-
intent = in
432-
[Stateout]
433-
standard_name = GFS_stateout_type_instance
434-
long_name = prognostic state or tendencies return to dycore
435-
units = DDT
436-
dimensions = ()
437-
type = GFS_stateout_type
438-
intent = in
439-
[Sfcprop]
440-
standard_name = GFS_sfcprop_type_instance
441-
long_name = instance of derived type GFS_sfcprop_type
442-
units = DDT
443-
dimensions = ()
444-
type = GFS_sfcprop_type
445-
intent = in
446-
[Coupling]
447-
standard_name = GFS_coupling_type_instance
448-
long_name = instance of derived type GFS_coupling_type
449-
units = DDT
450-
dimensions = ()
451-
type = GFS_coupling_type
452-
intent = in
453-
[Grid]
454-
standard_name = GFS_grid_type_instance
455-
long_name = instance of derived type GFS_grid_type
456-
units = DDT
457-
dimensions = ()
458-
type = GFS_grid_type
459-
intent = in
460-
[Tbd]
461-
standard_name = GFS_tbd_type_instance
462-
long_name = instance of derived type GFS_tbd_type
463-
units = DDT
464-
dimensions = ()
465-
type = GFS_tbd_type
466-
intent = in
467-
[Cldprop]
468-
standard_name = GFS_cldprop_type_instance
469-
long_name = instance of derived type GFS_cldprop_type
470-
units = DDT
471-
dimensions = ()
472-
type = GFS_cldprop_type
473-
intent = in
474-
[Radtend]
475-
standard_name = GFS_radtend_type_instance
476-
long_name = instance of derived type GFS_radtend_type
477-
units = DDT
478-
dimensions = ()
479-
type = GFS_radtend_type
480-
intent = in
481-
[Diag]
482-
standard_name = GFS_diag_type_instance
483-
long_name = instance of derived type GFS_diag_type
484-
units = DDT
485-
dimensions = ()
486-
type = GFS_diag_type
487-
intent = in
488-
[Interstitial]
489-
standard_name = GFS_interstitial_type_instance_all_threads
490-
long_name = instance of derived type GFS_interstitial_type
491-
units = DDT
492-
dimensions = (number_of_openmp_threads)
493-
type = GFS_interstitial_type
494-
intent = in
495-
[errmsg]
496-
standard_name = ccpp_error_message
497-
long_name = error message for error handling in CCPP
498-
units = none
499-
dimensions = ()
500-
type = character
501-
kind = len=*
502-
intent = out
503-
[errflg]
504-
standard_name = ccpp_error_code
505-
long_name = error code for error handling in CCPP
506-
units = 1
507-
dimensions = ()
508-
type = integer
509-
intent = out
510-
511317
########################################################################
512318
[ccpp-arg-table]
513319
name = GFS_interstitialtoscreen_run

0 commit comments

Comments
 (0)