Merge branch 'develop' into feature/sfc_climo_gen.frac

Fixes ufs-community#709.

Author: GeorgeGayno-NOAA

modulefiles/build.wcoss2.intel.lua

@@ -5,10 +5,10 @@ Load environment to compile UFS_UTILS on WCOSS2
 cmake_ver=os.getenv("cmake_ver") or "3.20.2"
 load(pathJoin("cmake", cmake_ver))
 
-PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
+PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.3.3"
 load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
 
-craype_ver=os.getenv("craype_ver") or "2.7.13"
+craype_ver=os.getenv("craype_ver") or "2.7.17"
 load(pathJoin("craype", craype_ver))
 
 intel_ver=os.getenv("intel_ver") or "19.1.3.304"
@@ -57,7 +57,7 @@ g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
 
 -- for mpiexec command
-cray_pals_ver=os.getenv("cray_pals_ver") or "1.0.12"
+cray_pals_ver=os.getenv("cray_pals_ver") or "1.2.2"
 load(pathJoin("cray-pals", cray_pals_ver))
 
 udunits_ver=os.getenv("udunits_ver") or "2.2.28"

parm/msis_lib/msis21.parm

@@ -19,6 +19,7 @@ export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE="gaussian_netcdf"
 export CONVERT_SFC=".false."
 export CONVERT_NST=".false."
+export WAM_PARM_FILE=${HOMEufs}/parm/msis_lib/msis21.parm
 
 export CDATE=2020020200
 

reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh

@@ -23,11 +23,13 @@ set(lib_src
 
 set(exe_src chgres.F90)
 
+add_subdirectory(msis2.1.fd)
+
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -assume byterecl")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-0 -fdefault-real-8")
-  
+
   # Turn on this argument mismatch flag for gfortran10.
   if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
      set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch")
@@ -55,6 +57,7 @@ target_link_libraries(
   sp::sp_d
   w3nco::w3nco_d
   esmf
+  msis2
   MPI::MPI_Fortran
   NetCDF::NetCDF_Fortran)
 

sorc/chgres_cube.fd/CMakeLists.txt

@@ -51,7 +51,7 @@ module atmosphere
                                        terrain_target_grid
 
  use program_setup, only             : vcoord_file_target_grid, &
-                                       wam_cold_start, & 
+                                       wam_cold_start, wam_parm_file, & 
                                        cycle_year, cycle_mon,     &
                                        cycle_day, cycle_hour,     &
                                        regional, &
@@ -349,7 +349,7 @@ subroutine atmosphere_driver(localpet)
  call vintg
 
  if( wam_cold_start ) then 
-   call vintg_wam (cycle_year,cycle_mon,cycle_day,cycle_hour)
+   call vintg_wam (cycle_year,cycle_mon,cycle_day,cycle_hour,wam_parm_file)
  endif
 
 !-----------------------------------------------------------------------------------
@@ -1521,15 +1521,17 @@ END SUBROUTINE VINTG_THOMP_MP_CLIMO
 !! @param [in] month  initial month
 !! @param [in] day  initial day
 !! @param [in] hour  initial hour
+!! @param [in] pf    path to MSIS2.1 parm file
 !!
 !! @author Hann-Ming Henry Juang NCEP/EMC
- SUBROUTINE VINTG_WAM (YEAR,MONTH,DAY,HOUR)
+ SUBROUTINE VINTG_WAM (YEAR,MONTH,DAY,HOUR,PF)
 
  IMPLICIT NONE
 
  include 'mpif.h'
 
  INTEGER, INTENT(IN)             :: YEAR,MONTH,DAY,HOUR
+ CHARACTER(*), INTENT(IN)        :: PF
 
  REAL(ESMF_KIND_R8), PARAMETER   :: AMO  = 15.9994  ! molecular weight of o
  REAL(ESMF_KIND_R8), PARAMETER   :: AMO2 = 31.999   !molecular weight of o2
@@ -1650,11 +1652,9 @@ SUBROUTINE VINTG_WAM (YEAR,MONTH,DAY,HOUR)
      DO K=1,LEV_TARGET
        IF(P2PTR(I,J,K).le.P1PTR(I,J,LEV_INPUT)) THEN
          KREF     =K-1
-!x       print*,'VINTG_WAM: KREF P1 P2 ',KREF,P1PTR(I,J,LEV_INPUT),P2PTR(I,J,K)
-         GO TO 11
+         EXIT
        ENDIF
      ENDDO
- 11  CONTINUE
 !
      DO K=KREF,LEV_TARGET
        COE = P2PTR(I,J,K) / P2PTR(I,J,KREF)
@@ -1683,10 +1683,9 @@ SUBROUTINE VINTG_WAM (YEAR,MONTH,DAY,HOUR)
        DO K=1,LEV_TARGET
          IF(P2PTR(I,J,K).le.P1PTR(I,J,LEV_INPUT)) THEN
            KREF     =K-1
-           GO TO 22
+           EXIT
          ENDIF
        ENDDO
- 22    CONTINUE
 !
        DO K=KREF,LEV_TARGET
          COE = MIN(1.0, P2PTR(I,J,K) / P2PTR(I,J,KREF) )
@@ -1712,7 +1711,7 @@ SUBROUTINE VINTG_WAM (YEAR,MONTH,DAY,HOUR)
      DO K=1,LEV_TARGET
        PRMB(K) = P2PTR(I,J,K) * 0.01
      ENDDO
-     CALL GETTEMP(ICDAY,1,DEGLAT,1,PRMB,LEV_TARGET,TEMP,ON,O2N,N2N)
+     CALL GETTEMP(ICDAY,DEGLAT,PRMB,LEV_TARGET,PF,TEMP,ON,O2N,N2N)
 !
      DO K=1,LEV_TARGET
        SUMMASS = ON(K)*AMO+O2N(K)*AMO2+N2N(K)*AMN2
@@ -1730,10 +1729,9 @@ SUBROUTINE VINTG_WAM (YEAR,MONTH,DAY,HOUR)
      DO K=1,LEV_TARGET
        IF(P2PTR(I,J,K).le.P1PTR(I,J,LEV_INPUT)) THEN
          KREF     =K-1
-         GO TO 33
+         EXIT
        ENDIF
      ENDDO
- 33  CONTINUE
 !
      DO K=KREF,LEV_TARGET
        T2PTR(I,J,K) = TEMP(K)

sorc/chgres_cube.fd/atmosphere.F90

@@ -897,7 +897,7 @@ FILE_PATTERNS          = *.F90 \
 # be searched for input files as well.
 # The default value is: NO.
 
-RECURSIVE              = YES
+RECURSIVE              = NO
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -906,7 +906,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../../fre-nctools.fd
+EXCLUDE                = 
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

sorc/chgres_cube.fd/docs/Doxyfile.in

@@ -0,0 +1,26 @@
+include(FetchContent)
+include(CheckFortranCompilerFlag)
+
+add_library(msis2
+            msis_utils.F90 
+            msis_constants.F90 
+            msis_init.F90 
+            msis_gfn.F90
+            msis_tfn.F90
+            msis_dfn.F90
+            msis_calc.F90
+            msis_gtd8d.F90)
+
+set_target_properties(msis2 PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include)
+
+target_include_directories(msis2 INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include)
+
+if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
+  # msis_calc:bspline has argument mismatch on nodes variable
+  target_compile_options(msis2 PRIVATE -std=legacy)
+endif()
+
+target_link_libraries(
+  msis2
+  PUBLIC
+  MPI::MPI_Fortran)