From 081b9c15eb607ddfb572f2bbc6ad132977a09b97 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 25 May 2018 12:43:09 -0600 Subject: [PATCH 1/2] Update hardcoded IPD_driver_cap.F90 for FV3v0: the current caps now need to carry the _run suffix, and (empty) _init and _finalize caps are required; also: remove unused scheme.xml --- IPD_layer/IPD_driver_cap.F90 | 78 ++++++++++++++-- IPD_layer/scheme.xml | 166 ----------------------------------- 2 files changed, 69 insertions(+), 175 deletions(-) delete mode 100644 IPD_layer/scheme.xml diff --git a/IPD_layer/IPD_driver_cap.F90 b/IPD_layer/IPD_driver_cap.F90 index edccb05d7..24a6d7c8b 100644 --- a/IPD_layer/IPD_driver_cap.F90 +++ b/IPD_layer/IPD_driver_cap.F90 @@ -42,13 +42,28 @@ module IPD_driver_cap private - public :: ipd_initialize_cap, & - ipd_setup_step_cap, & - ipd_finalize_cap + public :: ipd_initialize_init_cap, & + ipd_initialize_run_cap, & + ipd_initialize_finalize_cap, & + ipd_setup_step_init_cap, & + ipd_setup_step_run_cap, & + ipd_setup_step_finalize_cap, & + ipd_finalize_init_cap, & + ipd_finalize_run_cap, & + ipd_finalize_finalize_cap contains - function ipd_initialize_cap(ptr) bind(c) result(ierr) + function ipd_initialize_init_cap(ptr) bind(c) result(ierr) + + integer(c_int32_t) :: ierr + type(c_ptr), intent(inout) :: ptr + + ierr = 0 + + end function ipd_initialize_init_cap + + function ipd_initialize_run_cap(ptr) bind(c) result(ierr) integer(c_int32_t) :: ierr type(c_ptr), intent(inout) :: ptr @@ -121,9 +136,27 @@ function ipd_initialize_cap(ptr) bind(c) result(ierr) l_snupx = snupx l_salp_data = salp_data - end function ipd_initialize_cap + end function ipd_initialize_run_cap + + function ipd_initialize_finalize_cap(ptr) bind(c) result(ierr) + + integer(c_int32_t) :: ierr + type(c_ptr), intent(inout) :: ptr + + ierr = 0 + + end function ipd_initialize_finalize_cap + + function ipd_setup_step_init_cap(ptr) bind(c) result(ierr) + + integer(c_int32_t) :: ierr + type(c_ptr), intent(inout) :: ptr + + ierr = 0 + + end function ipd_setup_step_init_cap - function ipd_setup_step_cap(ptr) bind(c) result(ierr) + function ipd_setup_step_run_cap(ptr) bind(c) result(ierr) integer(c_int32_t) :: ierr type(c_ptr), intent(inout) :: ptr @@ -171,9 +204,27 @@ function ipd_setup_step_cap(ptr) bind(c) result(ierr) IPD_Diag=IPD_Diag, & IPD_Restart=IPD_Restart) - end function IPD_setup_step_cap + end function IPD_setup_step_run_cap - function ipd_finalize_cap(ptr) bind(c) result(ierr) + function ipd_setup_step_finalize_cap(ptr) bind(c) result(ierr) + + integer(c_int32_t) :: ierr + type(c_ptr), intent(inout) :: ptr + + ierr = 0 + + end function ipd_setup_step_finalize_cap + + function ipd_finalize_init_cap(ptr) bind(c) result(ierr) + + integer(c_int32_t) :: ierr + type(c_ptr), intent(inout) :: ptr + + ierr = 0 + + end function ipd_finalize_init_cap + + function ipd_finalize_run_cap(ptr) bind(c) result(ierr) integer(c_int32_t) :: ierr type(c_ptr), intent(inout) :: ptr @@ -182,6 +233,15 @@ function ipd_finalize_cap(ptr) bind(c) result(ierr) call IPD_finalize() - end function ipd_finalize_cap + end function ipd_finalize_run_cap + + function ipd_finalize_finalize_cap(ptr) bind(c) result(ierr) + + integer(c_int32_t) :: ierr + type(c_ptr), intent(inout) :: ptr + + ierr = 0 + + end function ipd_finalize_finalize_cap end module IPD_driver_cap diff --git a/IPD_layer/scheme.xml b/IPD_layer/scheme.xml deleted file mode 100644 index e9a3ab95c..000000000 --- a/IPD_layer/scheme.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - IPD_Control - - IPD_Control - 0 - type(IPD_control_type) - - - IPD_Data - - IPD_Data - 1 - type(IPD_data_type) - - - IPD_Diag - - IPD_Diag - 1 - type(IPD_diag_type) - - - IPD_Restart - - IPD_Restart - 0 - type(IPD_restart_type) - - - Init_parm - - Init_parm - 0 - type(IPD_init_type) - - - - - - IPD_Control - - IPD_Control - 0 - type(IPD_control_type) - - - IPD_Data - - IPD_Data - 1 - type(IPD_data_type) - - - IPD_Diag - - IPD_Diag - 1 - type(IPD_diag_type) - - - IPD_Restart - - IPD_Restart - 0 - type(IPD_restart_type) - - - - - - IPD_Control - - IPD_Control - 0 - type(IPD_control_type) - - - IPD_Data - - IPD_Data - 0 - type(IPD_data_type) - - - IPD_Diag - - IPD_Diag - 1 - type(IPD_diag_type) - - - IPD_Restart - - IPD_Restart - 0 - type(IPD_restart_type) - - - - - - IPD_Control - - IPD_Control - 0 - type(IPD_control_type) - - - IPD_Data - - IPD_Data - 0 - type(IPD_data_type) - - - IPD_Diag - - IPD_Diag - 1 - type(IPD_diag_type) - - - IPD_Restart - - IPD_Restart - 0 - type(IPD_restart_type) - - - - - - IPD_Control - - IPD_Control - 0 - type(IPD_control_type) - - - IPD_Data - - IPD_Data - 0 - type(IPD_data_type) - - - IPD_Diag - - IPD_Diag - 1 - type(IPD_diag_type) - - - IPD_Restart - - IPD_Restart - 0 - type(IPD_restart_type) - - - - From be339e3b4c02c83fe0ac0569096d078405bf482d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 23 May 2018 14:34:26 -0600 Subject: [PATCH 2/2] physics/radlw_main.f: remove whitespaces --- physics/radlw_main.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physics/radlw_main.f b/physics/radlw_main.f index d2402f71d..d0eeca63c 100644 --- a/physics/radlw_main.f +++ b/physics/radlw_main.f @@ -436,7 +436,7 @@ subroutine rrtmg_lw_run & & HLW0,HLWB,FLXPRF, & ! --- optional & cld_lwp, cld_ref_liq, cld_iwp, cld_ref_ice, & & cld_rwp,cld_ref_rain, cld_swp, cld_ref_snow, & - & cld_od, errmsg, errflg & + & cld_od, errmsg, errflg & & )