Merge pull request #86 from climbfuji/ccpp-run-init-final

CCPP run _init and _final for schemes
NCAR · May 31, 2018 · cb7f8e7 · cb7f8e7
2 parents 1660d74 + be339e3
commit cb7f8e7
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 176 deletions.
diff --git 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
diff --git 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                                     &
      &     )