Merge pull request #34 from climbfuji/ccpp_compliancy_after_merge_step1

Ccpp compliancy after merge step1
NCAR · Dec 27, 2017 · b32a12f · b32a12f
2 parents 1476a7f + 69e599d
commit b32a12f
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 1,560 deletions.
diff --git a/physics/GFS_calpreciptype.f90 b/physics/GFS_calpreciptype.f90
@@ -41,7 +41,7 @@ end subroutine GFS_calpreciptype_init
 !!|    srflag      | flag_for_precipitation_type                       | snow(1)/rain(0) flag for precipitation                   | 1       | 1    | real    | kind_phys | out    |  F       |
 !!|    tprcp       | precipitation_amount_in_one_dynamics_time_step    | precipitation amount in one dynamics time step           | m       | 1    | real    | kind_phys | out    |  F       |
 !!
-      subroutine GFS_calpreciptype_run (kdt,nrcm,im,ix,lm,lp1,randomno,  &
+      subroutine GFS_calpreciptype_run(kdt,nrcm,im,ix,lm,lp1,randomno,  &
                                cal_pre,                              &
                                gt0,gq0,prsl,prsi, rainc,frain,rain1, &
                                phii,n3dfercld,tskin,sr,phy_f3d,     & !input
@@ -307,7 +307,7 @@ subroutine GFS_calpreciptype_run (kdt,nrcm,im,ix,lm,lp1,randomno,  &
       endif
 
       return
-      end subroutine GFS_CALPRECIPTYPE_RUN
+      end subroutine GFS_calpreciptype_run
 !
 !&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
 !
@@ -548,7 +548,7 @@ subroutine calwxt(lm,lp1,t,q,pmid,pint,              &
 !      deallocate (twet)
 
       return
-      end
+      end subroutine calwxt
 !
 !
 !ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
@@ -836,7 +836,7 @@ subroutine calwxt_ramer(lm,lp1,t,q,pmid,rh,td,pint,ptyp)
 
       return
 !
-      end
+      end subroutine calwxt_ramer
 !
 !
 !--------------------------------------------------------------------------
@@ -894,7 +894,7 @@ real function xmytw(t,td,p)
       end if
 !
       return
-      end
+      end function xmytw
 !
 !
 !$$$  subprogram documentation block
@@ -1124,7 +1124,7 @@ subroutine calwxt_bourg(lm,lp1,rn,g,t,q,pmid,pint,zint,ptype)
       end if
 !
       return
-      end
+      end subroutine calwxt_bourg
 !
 !
        subroutine calwxt_revised(lm,lp1,t,q,pmid,pint,         &
@@ -1380,7 +1380,7 @@ subroutine calwxt_revised(lm,lp1,t,q,pmid,pint,         &
       endif
 
       return
-      end
+      end subroutine calwxt_revised
 !
 !
       subroutine calwxt_explicit(lm,tskin,sr,f_rimef,iwx)
@@ -1440,7 +1440,7 @@ subroutine calwxt_explicit(lm,tskin,sr,f_rimef,iwx)
            iwx  = iwx + 1
         endif
       endif
-      end
+      end subroutine calwxt_explicit
 !
 !
        subroutine calwxt_dominant(nalg,rain,freezr,sleet,snow, &
@@ -1511,7 +1511,7 @@ subroutine calwxt_dominant(nalg,rain,freezr,sleet,snow, &
       endif
 !
       return
-      end 
+      end subroutine calwxt_dominant
 
 !> \section arg_table_GFS_calpreciptype_finalize Argument table
 !!

diff --git a/physics/GFS_radsw_post.f90 b/physics/GFS_radsw_post.f90
@@ -19,6 +19,7 @@ end subroutine GFS_radsw_post_init
 !!|   Radtend         | FV3-GFS_Radtend_type                                                    | Fortran DDT containing FV3-GFS fields targetted for diagnostic output         | DDT      |  0   | GFS_typedefs%GFS_radtend_type |           | inout     | F        |
 !!|   Coupling        | FV3-GFS_Coupling_type                                                   | Fortran DDT containing FV3-GFS fields to/from coupling with other components  | DDT      |  0   | GFS_typedefs%GFS_coupling_type|           | inout     | F        |
 !!|   ltp             | extra_top_layer                                                         | extra top layers                                                              | none     |  0   | integer                       |           | in        | F        |
+!!|   nday            | daytime_points_dimension                                                | daytime points dimension                                                      | index    |  0   | integer                       |           | in        | F        |
 !!|   lm              | vertical_layer_dimension_for_radiation                                  | number of vertical layers for radiation calculation                           | index    |  0   | integer                       |           | in        | F        |   
 !!|   kd              | vertical_index_difference_between_in-out_and_local                      | vertical index difference between in/out and local                            | index    |  0   | integer                       |           | in        | F        |
 !!|   htswc           | tendency_of_air_temperature_due_to_shortwave_heating                    | total sky heating rate due to shortwave radiation                             | K s-1    |  2   | real                          | kind_phys | in        | F        |