Cleanup Intel Debug messages

Author: mathomp4

Apps/Comp_Testing_Driver.F90

@@ -17,11 +17,11 @@ program comp_testing_driver
   call main()
 
   contains
-    
+
     subroutine main()
       integer :: status, rc, local_PET, n_PET
       type(ESMF_VM) :: vm
-      character(len=ESMF_MAXSTR) :: filename, comp_name
+      character(len=ESMF_MAXSTR) :: filename
       type(ESMF_Config) :: config
       class(BaseProfiler), pointer :: t_p
 
@@ -48,8 +48,8 @@ end subroutine main
   subroutine run_component_driver(filename, rc)
     character(len=*), intent(in) :: filename
     integer, intent(out) :: rc
-    integer :: status, root_id, user_RC, RUN_DT, i, j, nc_id, var_id
-    integer :: NX, NY, item_count, field_count, phase
+    integer :: status, root_id, user_RC, RUN_DT
+    integer :: NX, NY, phase
     character(len=ESMF_MAXSTR) :: comp_name, shared_obj, restart_file
     type(ESMF_Clock) :: clock
     type(ESMF_TimeInterval) :: time_interval
@@ -58,24 +58,19 @@ subroutine run_component_driver(filename, rc)
     type(ESMF_Config) :: config
     type(ESMF_Time), allocatable :: start_time(:)
     type(ESMF_Grid) :: grid
-    type(ESMF_Field) :: field
     type(MAPL_MetaComp), pointer :: mapl_obj
     real(kind=ESMF_KIND_R8), pointer :: lons_field_ptr(:,:), lats_field_ptr(:,:)
     type(NetCDF4_fileFormatter) :: formatter
     type(FileMetadata) :: basic_metadata
     type(FileMetadataUtils) :: metadata
     logical :: subset
-    character(len=ESMF_MAXSTR), allocatable :: item_name_list(:), field_name_list(:)
-    type(ESMF_StateItem_Flag):: item_type
-    type(ESMF_FieldBundle) :: field_bundle
-    type(ESMF_Field), allocatable :: field_list(:)
 
     ! get attributes from config file
     config = ESMF_ConfigCreate(_RC)
     call ESMF_ConfigLoadFile(config, filename, _RC)
     call get_config_attributes(config, comp_name, RUN_DT, restart_file, shared_obj, phase, subset, NX, NY, _RC)
 
-    ! create a clock, set current time to required time consistent with checkpoints used 
+    ! create a clock, set current time to required time consistent with checkpoints used
     call formatter%open(restart_file, pFIO_Read, _RC)
     call ESMF_TimeIntervalSet(time_interval, s=RUN_DT, _RC)
     basic_metadata=formatter%read(_RC)
@@ -93,8 +88,8 @@ subroutine run_component_driver(filename, rc)
     call MAPL_InternalStateRetrieve(temp_GC, mapl_obj, _RC)
     call MAPL_Set(mapl_obj, CF=config, _RC)
 
-    root_id = MAPL_AddChild(mapl_obj, grid=grid, name=comp_name, userRoutine="setservices_", sharedObj=shared_obj, _RC) 
-    
+    root_id = MAPL_AddChild(mapl_obj, grid=grid, name=comp_name, userRoutine="setservices_", sharedObj=shared_obj, _RC)
+
     GC = mapl_obj%get_child_gridcomp(root_id)
     import = mapl_obj%get_child_import_state(root_id)
     export = mapl_obj%get_child_export_state(root_id)
@@ -111,13 +106,13 @@ subroutine run_component_driver(filename, rc)
     else
        call ESMF_GridCompSet(GC, grid=grid, _RC)
     end if
- 
 
-    call ESMF_GridCompInitialize(GC, importState=import, exportState=export, clock=clock, userRC=user_RC, _RC) 
+
+    call ESMF_GridCompInitialize(GC, importState=import, exportState=export, clock=clock, userRC=user_RC, _RC)
 
     call ESMF_GridCompRun(GC, importState=import, exportState=export, clock=clock, phase=phase, userRC=user_RC, _RC)
 
-    call ESMF_GridCompFinalize(GC, importState=import, exportState=export, clock=clock, userRC=user_RC, _RC) 
+    call ESMF_GridCompFinalize(GC, importState=import, exportState=export, clock=clock, userRC=user_RC, _RC)
 
     _RETURN(_SUCCESS)
   end subroutine run_component_driver

CHANGELOG.md

@@ -27,10 +27,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated CircleCI to use v11.2.0 bcs
 - Backported changes in `pfio` from `release/MAPL-v3` to enable `pfio` unit tests
 - Update `components.yaml`
-  - ESMA_cmake v3.32.0 (Support for Intel Fortran under Rosetta2)
+  - ESMA_cmake v3.33.0 (Support for Intel Fortran under Rosetta2, updated NAG flags)
 - Cleanup Fortran
   - Converted all uses of `mpif.h` to `use mpi`
   - Converted all uses of `character*` to `character(len=)`
+  - Removed many unused variables
+  - Added many `_UNUSED_DUMMY()` calls
 
 ### Fixed
 

Tests/ExtDataRoot_GridComp.F90

@@ -69,7 +69,6 @@ subroutine SetServices ( GC, RC )
          type(ESMF_Config)          :: cf
          type(SyntheticFieldSupportWrapper) :: synthWrap
          type(SyntheticFieldSupport), pointer :: synth
-         logical :: on_tiles
          integer :: vloc
 
          call ESMF_GridCompGet( GC, NAME=COMP_NAME, CONFIG=CF, _RC )

Tests/pfio_MAPL_demo.F90

@@ -180,6 +180,8 @@ integer function create_member_subcommunicator(comm, n_members, npes_member, rc)
       ! _VERIFY(status)
       subcommunicator = split_comm%get_subcommunicator()
 
+      _UNUSED_DUMMY(rc)
+
    end function create_member_subcommunicator
 !------------------------------------------------------------------------------
 !>
@@ -228,7 +230,6 @@ end subroutine initialize_ioserver
 !
    subroutine perform_domain_deposition()
       integer, allocatable :: proc_sizes(:)
-      integer :: ierr
       !------------------------------------------------
       ! ---> Perform domain decomposition for the model
       !------------------------------------------------

base/Base/Base_Base.F90

@@ -43,7 +43,6 @@ module MAPL_Base
   public MAPL_LatLonGridCreate   ! Creates regular Lat/Lon ESMF Grids
   public MAPL_Nhmsf
   public MAPL_NSECF
-  public MAPL_Nsecf2
   public MAPL_PackTime
   public MAPL_PackDateTime
   public MAPL_RemapBounds
@@ -75,7 +74,7 @@ module MAPL_Base
   public MAPL_GetCorrectedPhase
 
 
-  real,    public, parameter :: MAPL_UNDEF              = 1.0e15  
+  real,    public, parameter :: MAPL_UNDEF              = 1.0e15
 
 
   character(len=ESMF_MAXSTR), public, parameter :: MAPL_StateItemOrderList = 'MAPL_StateItemOrderList'
@@ -142,42 +141,42 @@ module MAPL_Base
      module subroutine MAPL_AllocateCoupling(field, rc)
        use ESMF, only: ESMF_Field
        type(ESMF_Field),  intent(INOUT) :: field
-       integer, optional, intent(  OUT) :: rc             
+       integer, optional, intent(  OUT) :: rc
      end subroutine MAPL_AllocateCoupling
 
      module subroutine MAPL_FieldAllocCommit(field, dims, location, typekind, &
           hw, ungrid, default_value, rc)
        use ESMF, only: ESMF_Field
        type(ESMF_Field),               intent(INOUT) :: field
-       integer,                        intent(IN   ) :: dims            
-       integer,                        intent(IN   ) :: location            
+       integer,                        intent(IN   ) :: dims
+       integer,                        intent(IN   ) :: location
        integer,                        intent(IN   ) :: typekind
        integer,                        intent(IN   ) :: hw !halowidth
        integer,              optional, intent(IN   ) :: ungrid(:)
        real,                 optional, intent(IN   ) :: default_value
-       integer,              optional, intent(  OUT) :: rc             
+       integer,              optional, intent(  OUT) :: rc
      end subroutine MAPL_FieldAllocCommit
 
      module subroutine MAPL_FieldF90Deallocate(field, rc)
        use ESMF, only: ESMF_Field
        type(ESMF_Field),  intent(INOUT) :: field
-       integer, optional, intent(  OUT) :: rc             
+       integer, optional, intent(  OUT) :: rc
      end subroutine MAPL_FieldF90Deallocate
 
      module subroutine MAPL_SetPointer2DR4(state, ptr, name, rc)
        use ESMF, only: ESMF_State
        type(ESMF_State),               intent(INOUT) :: state
        real,                           pointer       :: ptr(:,:)
        character(len=*),               intent(IN   ) :: name
-       integer,              optional, intent(  OUT) :: rc             
+       integer,              optional, intent(  OUT) :: rc
      end subroutine MAPL_SetPointer2DR4
 
      module subroutine MAPL_SetPointer3DR4(state, ptr, name, rc)
        use ESMF, only: ESMF_State
        type(ESMF_State),               intent(INOUT) :: state
        real,                           pointer       :: ptr(:,:,:)
        character(len=*),               intent(IN   ) :: name
-       integer,              optional, intent(  OUT) :: rc             
+       integer,              optional, intent(  OUT) :: rc
      end subroutine MAPL_SetPointer3DR4
 
      module subroutine MAPL_DecomposeDim ( dim_world,dim,NDEs, unusable, symmetric, min_DE_extent )
@@ -201,13 +200,13 @@ end subroutine MAPL_MakeDecomposition
 
      module subroutine MAPL_Interp_Fac (TIME0, TIME1, TIME2, FAC1, FAC2, RC)
        use ESMF, only: ESMF_Time
-       !------------------------------------------------------------        
+       !------------------------------------------------------------
 
        !  PURPOSE:
        !  ========
        !
-       !    Compute interpolation factors, fac, to be used 
-       !    in the calculation of the instantaneous boundary 
+       !    Compute interpolation factors, fac, to be used
+       !    in the calculation of the instantaneous boundary
        !    conditions, ie:
        !
        !     q(i,j) = fac1*q1(i,j) + (1.-fac1)*q2(i,j)
@@ -220,16 +219,16 @@ module subroutine MAPL_Interp_Fac (TIME0, TIME1, TIME2, FAC1, FAC2, RC)
        !  INPUT:
        !  ======
        !    time0    : Time of current timestep
-       !    time1    : Time of boundary data 1 
-       !    time2    : Time of boundary data 2 
+       !    time1    : Time of boundary data 1
+       !    time2    : Time of boundary data 2
 
        !  OUTPUT:
        !  =======
        !     fac1    : Interpolation factor for Boundary Data 1
        !
-       ! ------------------------------------------------------------        
-       !               GODDARD LABORATORY FOR ATMOSPHERES            
-       ! ------------------------------------------------------------        
+       ! ------------------------------------------------------------
+       !               GODDARD LABORATORY FOR ATMOSPHERES
+       ! ------------------------------------------------------------
 
        type(ESMF_Time),   intent(in ) :: TIME0, TIME1, TIME2
        real,              intent(out) :: FAC1
@@ -240,7 +239,7 @@ end subroutine MAPL_Interp_Fac
      module subroutine MAPL_ClimInterpFac (CLOCK,I1,I2,FAC, RC)
        use ESMF, only: ESMF_Clock
 
-       !------------------------------------------------------------        
+       !------------------------------------------------------------
 
        type(ESMF_CLOCK),  intent(in ) :: CLOCK
        integer,           intent(OUT) :: I1, I2
@@ -296,25 +295,21 @@ module subroutine MAPL_tick (nymd,nhms,ndt)
        integer nymd,nhms,ndt
      end subroutine MAPL_tick
 
-     integer module function MAPL_nsecf2 (nhhmmss,nmmdd,nymd)
-       integer nhhmmss,nmmdd,nymd
-     end function MAPL_nsecf2
-
      integer module function MAPL_nhmsf (nsec)
        implicit none
        integer  nsec
      end function MAPL_nhmsf
 
      ! A year is a leap year if
-     ! 1) it is divible by 4, and 
+     ! 1) it is divible by 4, and
      ! 2) it is not divisible by 100, unless
      ! 3) it is also divisible by 400.
      logical module function MAPL_LEAP(NY)
        integer, intent(in) :: NY
      end function MAPL_LEAP
 
 
-     integer module function MAPL_incymd (NYMD,M)                                                  
+     integer module function MAPL_incymd (NYMD,M)
        integer nymd,m
      end function MAPL_incymd
 
@@ -440,18 +435,18 @@ end function MAPL_RemapBounds_3dr8
 ! grid with 72 layers:
 !
 !```
-!       GDEF: LatLon 
-!       IDEF: 32  
-!       JDEF: 16  
-!       LDEF:  1  
+!       GDEF: LatLon
+!       IDEF: 32
+!       JDEF: 16
+!       LDEF:  1
 !       XDEF: 288 LINEAR -180. 1.25
 !       YDEF: 181 LINEAR -90. 1.
 !       ZDEF:  72 LINEAR 1 1
 !```
 ! More generally,
 !```
 !       GDEF: LatLon
-!       IDEF: Nx 
+!       IDEF: Nx
 !       JDEF: Ny
 !       LDEF: Nz
 !       XDEF: IM_World XCoordType BegLon, DelLon
@@ -537,16 +532,16 @@ module function MAPL_LatLonGridCreate (Name, vm,                 &
        !   There are 3 possibilities to provide the coordinate information:
 
        ! 1) Thru Config object:
-       type(ESMF_Config), OPTIONAL, target,     & 
-            intent(in)  :: Config 
+       type(ESMF_Config), OPTIONAL, target,     &
+            intent(in)  :: Config
 
        ! 2) Thru a resource file:
        character(len=*),  OPTIONAL, intent(in)  :: ConfigFile
 
 
        ! 3) Thru argument list:
        integer,           OPTIONAL, intent(in)  :: Nx, Ny          ! Layout
-       integer,           OPTIONAL, intent(in)  :: IM_World        ! Zonal 
+       integer,           OPTIONAL, intent(in)  :: IM_World        ! Zonal
        real,              OPTIONAL, intent(in)  :: BegLon, DelLon  ! in degrees
 
        integer,           OPTIONAL, intent(in)  :: JM_World        ! Meridional
@@ -791,7 +786,7 @@ module MAPL_BaseMod
   use MAPL_RangeMod, only:   MAPL_Range
   use mapl_MaplGrid, only: MAPL_GridGet, MAPL_DistGridGet, MAPL_GetImsJms, MAPL_GridHasDE
   use MAPL_Constants
-   
+
 
 
 

base/Base/Base_Base_implementation.F90

@@ -1069,41 +1069,6 @@ module subroutine MAPL_tick (nymd,nhms,ndt)
     RETURN
   end subroutine MAPL_tick
 
-  integer module function MAPL_nsecf2 (nhhmmss,nmmdd,nymd)
-    integer nhhmmss,nmmdd,nymd,nday,month
-    integer nsday,iday,iday2
-    integer i,nsegm,nsegd
-    PARAMETER ( NSDAY  = 86400 )
-    INTEGER YEAR, DAY, SEC
-    integer    MNDY(12,4), mnd48(48)
-    DATA MND48/0,31,60,91,121,152,182,213,244,274,305,335,366,397,34*0 /
-    !     DATA MNDY /0,31,60,91,121,152,182,213,244,274,305,335,366,397,34*0 /
-    equivalence ( mndy(1,1), mnd48(1) )
-    MAPL_nsecf2 = MAPL_nsecf( nhhmmss )
-    if( nmmdd.eq.0 ) return
-    DO I=15,48
-       !     MNDY(I,1) = MNDY(I-12,1) + 365
-       MND48(I) = MND48(I-12) + 365
-    end DO
-    nsegm =     nmmdd/100
-    nsegd = mod(nmmdd,100)
-    YEAR   = NYMD / 10000
-    MONTH  = MOD(NYMD,10000) / 100
-    DAY    = MOD(NYMD,100)
-    SEC    = MAPL_NSECF(nhhmmss)
-    IDAY   = MNDY( MONTH ,MOD(YEAR ,4)+1 )
-    month = month + nsegm
-    If( month.gt.12 ) then
-       month = month - 12
-       year = year + 1
-    endif
-    IDAY2  = MNDY( MONTH ,MOD(YEAR ,4)+1 )
-    nday = iday2-iday
-    if(nday.lt.0) nday = nday + 1461
-    nday = nday + nsegd
-    MAPL_nsecf2 = MAPL_nsecf2 + nday*nsday
-  end function MAPL_nsecf2
-
   integer module function MAPL_nhmsf (nsec)
     implicit none
     integer  nsec
@@ -3132,7 +3097,6 @@ module subroutine MAPL_GetGlobalHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid,
     ! MAPL_PI_R8/18, Japan Fuji mountain shift
     real(ESMF_KIND_R8), parameter :: shift= 0.174532925199433d0
 
-    real    :: tolerance
     logical :: good_grid
 
     if (npts == 0 ) then

base/ESMFL_Mod.F90

@@ -3500,7 +3500,7 @@ subroutine Bundle2State (BUN, STA, rc)
    real(kind=ESMF_KIND_R8), pointer :: dst_pr83d(:,:,:)
    type(ESMF_TypeKind_Flag) :: src_tk, dst_tk
    integer                  :: src_fieldRank, dst_fieldRank
-   logical                  :: NotInState,itemNotFound
+   logical                  :: NotInState
    character(len=ESMF_MAXSTR) :: NameInBundle
    type(ESMF_StateItem_Flag) :: itemType
 

base/MAPL_CubedSphereGridFactory.F90

@@ -1349,7 +1349,6 @@ function generate_file_reference3D(this,fpointer,metadata) result(ref)
       type(c_ptr) :: cptr
       real, pointer :: ptr_ref(:,:,:,:,:)
       logical :: face_format
-      integer :: status
 
       if (present(metadata)) then
          face_format = metadata%has_dimension('nf')