Merge pull request #6 from grantfirl/v6_to_main

update v6_to_main from main and fix typo

CMakeLists.txt

@@ -195,7 +195,7 @@ set_target_properties(ccpp_physics PROPERTIES VERSION ${PROJECT_VERSION}
 target_include_directories(ccpp_physics PUBLIC
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 
-target_link_libraries(ccpp_physics PUBLIC w3nco::w3nco_d NetCDF::NetCDF_Fortran)
+target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d NetCDF::NetCDF_Fortran)
 
 # Define where to install the library
 install(TARGETS ccpp_physics

physics/GFS_time_vary_pre.scm.F90

@@ -122,7 +122,7 @@ subroutine GFS_time_vary_pre_timestep_init (jdat, idat, dtp, nsswr, &
         else if (w3kindreal == 4) then
            rinc4(1:5) = 0
            call w3difdat(jdat,idat,4,rinc4)
-           sec = rina4c(4)
+           sec = rinc4(4)
         else
            write(0,*)' FATAL ERROR: Invalid w3kindreal'
            call abort

physics/sfc_diag_post.F90

@@ -40,14 +40,14 @@ subroutine sfc_diag_post_run (im, lsm, lsm_noahmp, dry, lssav, dtf, con_eps, con
         errmsg = ''
         errflg = 0
 
-        if (lsm == lsm_noahmp) then
-          do i=1,im
-            if(dry(i)) then
-              t2m(i) = t2mmp(i)
-              q2m(i) = q2mp(i)
-            endif
-          enddo
-        endif
+!       if (lsm == lsm_noahmp) then
+!         do i=1,im
+!           if(dry(i)) then
+!             t2m(i) = t2mmp(i)
+!             q2m(i) = q2mp(i)
+!           endif
+!         enddo
+!       endif
 
         if (lssav) then
           do i=1,im