remove whitespace changes, correct issue in atm_comp_nuopc

ESCOMP · Oct 3, 2024 · bf6defa · bf6defa
1 parent fac398b
commit bf6defa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90
@@ -87,7 +87,7 @@ subroutine cam_init(                                             &
    use cam_snapshot_common, only: cam_snapshot_deactivate
    use air_composition,  only: air_composition_init
    use phys_grid_ctem,   only: phys_grid_ctem_reg
-   use filenames,        only: interpret_filename_spec
+
    ! Arguments
    character(len=cl), intent(in) :: caseid                ! case ID
    character(len=cl), intent(in) :: ctitle                ! case title
@@ -122,6 +122,7 @@ subroutine cam_init(                                             &
    integer,           intent(in) :: stop_tod              ! Stop time of day (sec)
    integer,           intent(in) :: ref_ymd               ! Reference date (YYYYMMDD)
    integer,           intent(in) :: ref_tod               ! Reference time of day (sec)
+
    type(cam_out_t),   pointer    :: cam_out(:)       ! Output from CAM to surface
    type(cam_in_t) ,   pointer    :: cam_in(:)        ! Merged input state to CAM
 
@@ -151,7 +152,6 @@ subroutine cam_init(                                             &
 
    ! Read CAM namelists.
    filein = "atm_in" // trim(inst_suffix)
-
    call read_namelist(filein, single_column, scmlat, scmlon)
 
    ! Open initial or restart file, and topo file if specified.

diff --git a/src/control/cam_initfiles.F90 b/src/control/cam_initfiles.F90
@@ -119,8 +119,9 @@ subroutine cam_initfiles_readnl(nlfile)
          rest_pfile = interpret_filename_spec("rpointer.cam"//trim(inst_suffix)//".%y-%m-%d-%s", prev=.true.)
          inquire(file=trim(rest_pfile),exist=found)
          if(.not. found) then
-            write(iulog, "Warning : rpointer file "//trim(rest_pfile)//" not found.")
+            write(iulog, "INFO : rpointer file "//trim(rest_pfile)//" not found.")
             rest_pfile = "rpointer.cam"//trim(inst_suffix)
+            write(iulog, "  Try looking for "//trim(rest_pfile)//" ...")
             inquire(file=trim(rest_pfile),exist=found)
             if(.not. found) then
                call endrun(sub // ': ERROR: rpointer file: '//trim(rest_pfile) // ' not found')

diff --git a/src/control/runtime_opts.F90 b/src/control/runtime_opts.F90
@@ -109,6 +109,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
    logical,          intent(in) :: single_column
    real(r8),         intent(in) :: scmlat
    real(r8),         intent(in) :: scmlon
+
    !---------------------------Local variables-----------------------------
    character(len=*), parameter ::  subname = "read_namelist"
 

diff --git a/src/cpl/nuopc/atm_comp_nuopc.F90 b/src/cpl/nuopc/atm_comp_nuopc.F90
@@ -1985,7 +1985,7 @@ subroutine cam_write_clockrest( clock, yr_spec, mon_spec, day_spec, sec_spec, rc
        write(iulog,*) " containing this information"
        write(iulog,*) " writing rpointer file for driver clock info, rpointer.cpl"
        write(iulog,*) " writing restart clock info for driver= "//trim(restart_file)
-       open(newunit=unitn, file='rpointer.cpl', form='FORMATTED')
+       open(newunit=unitn, file=trim(restart_pfile), form='FORMATTED')
        write(unitn,'(a)') trim(restart_file)
        close(unitn)
     endif