Merge branch 'iulian787/erp_fixes_moab' (PR #7731)

rljacob · web-flow · commit 7e247538d7ea · 2025-09-28T23:43:10.000-05:00
Do not write restart files using mct data; use only moab and remove "moab" from the name.
mct parts of frankencoupler still needs to read the restart file though (written by moab)

[BFB]
diff --git a/components/eam/src/cpl/atm_comp_mct.F90 b/components/eam/src/cpl/atm_comp_mct.F90
@@ -90,13 +90,13 @@ module atm_comp_mct
 
   private :: atm_setgsmap_mct
   private :: atm_domain_mct
-  private :: atm_read_srfrest_mct
-  private :: atm_write_srfrest_mct
 #ifdef HAVE_MOAB
   private :: atm_read_srfrest_moab
   private :: atm_write_srfrest_moab
+#else
+  private :: atm_read_srfrest_mct
+  private :: atm_write_srfrest_mct
 #endif
-
 !--------------------------------------------------------------------------
 ! Private data
 !--------------------------------------------------------------------------
@@ -107,10 +107,7 @@ module atm_comp_mct
   integer, parameter  :: nlen = 256     ! Length of character strings
   character(len=nlen) :: fname_srf_cam  ! surface restart filename
   character(len=nlen) :: pname_srf_cam  ! surface restart full pathname
-#ifdef HAVE_MOAB
-  character(len=nlen) :: moab_fname_srf_cam  ! surface restart filename
-  character(len=nlen) :: moab_pname_srf_cam  ! surface restart full pathname
-#endif
+
   ! Filename specifier for restart surface file
   character(len=cl) :: rsfilename_spec_cam
 
@@ -507,12 +504,12 @@ subroutine atm_init_mct( EClock, cdata_a, x2a_a, a2x_a, NLFilename )
           call atm_export_moab(Eclock, cam_out)
 #endif
        else ! if (StepNo != 0) then
-
           call t_startf('atm_read_srfrest_mct')
           call atm_read_srfrest_mct( EClock, x2a_a, a2x_a )
           call t_stopf('atm_read_srfrest_mct')
 #ifdef HAVE_MOAB
           call atm_read_srfrest_moab ( EClock )
+         
 #endif
 
           ! Sent .true. as an optional argument so that restart_init is set to .true.  in atm_import
@@ -767,13 +764,15 @@ subroutine atm_run_mct( EClock, cdata_a, x2a_a, a2x_a)
     ! Write merged surface data restart file if appropriate
 
     if (rstwr_sync) then
+       
+#ifdef HAVE_MOAB
+       call atm_write_srfrest_moab(yr_spec=yr_sync, &
+            mon_spec=mon_sync, day_spec=day_sync, sec_spec=tod_sync)
+#else
        call t_startf('atm_write_srfrest_mct')
        call atm_write_srfrest_mct( x2a_a, a2x_a, &
             yr_spec=yr_sync, mon_spec=mon_sync, day_spec=day_sync, sec_spec=tod_sync)
        call t_stopf('atm_write_srfrest_mct')
-#ifdef HAVE_MOAB
-       call atm_write_srfrest_moab(yr_spec=yr_sync, &
-            mon_spec=mon_sync, day_spec=day_sync, sec_spec=tod_sync)
 #endif
     end if
 
@@ -1011,11 +1010,11 @@ subroutine atm_read_srfrest_moab( EClock )
         curr_day=day_spec, curr_tod=sec_spec )
    fname_srf_cam = interpret_filename_spec( rsfilename_spec_cam, case=get_restcase(), &
         yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec )
-   moab_fname_srf_cam = 'moab_'//trim(fname_srf_cam)
-   moab_pname_srf_cam = trim(get_restartdir() )//trim(moab_fname_srf_cam)
-   call getfil(moab_pname_srf_cam, moab_fname_srf_cam)
 
-   call cam_pio_openfile(File, moab_fname_srf_cam, 0)
+   pname_srf_cam = trim(get_restartdir() )//trim(fname_srf_cam)
+   call getfil(pname_srf_cam, fname_srf_cam)
+
+   call cam_pio_openfile(File, fname_srf_cam, 0)
 
    call pio_initdecomp(pio_subsystem, pio_double, (/ngcols/), global_ids, iodesc)
 
@@ -1125,13 +1124,12 @@ subroutine atm_write_srfrest_moab( yr_spec, mon_spec, day_spec, sec_spec )
 
    ! Determine and open surface restart dataset
 
-      ! Determine and open surface restart dataset
+   fname_srf_cam = interpret_filename_spec( rsfilename_spec_cam, &
+   yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec )
 
-   moab_fname_srf_cam = 'moab_'//trim(fname_srf_cam)
-
-   call cam_pio_createfile(File, trim(moab_fname_srf_cam))
+   call cam_pio_createfile(File, trim(fname_srf_cam))
    if (masterproc) then
-      write(iulog,*)'create file :', trim(moab_fname_srf_cam)
+      write(iulog,*)'create file :', trim(fname_srf_cam)
    end if
 
    call pio_initdecomp(pio_subsystem, pio_double, (/ngcols/), global_ids, iodesc)
@@ -1239,7 +1237,6 @@ subroutine atm_read_srfrest_mct( EClock, x2a_a, a2x_a)
          yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec )
     pname_srf_cam = trim(get_restartdir() )//fname_srf_cam
     call getfil(pname_srf_cam, fname_srf_cam)
-
     call cam_pio_openfile(File, fname_srf_cam, 0)
     call pio_initdecomp(pio_subsystem, pio_double, (/ngcols/), dof, iodesc)
     allocate(tmp(size(dof)))
@@ -1309,6 +1306,7 @@ subroutine atm_write_srfrest_mct( x2a_a, a2x_a, &
     type(io_desc_t)           :: iodesc
     character(CL)             :: itemc       ! string converted to char
     type(mct_string)          :: mstring     ! mct char type
+    character(len=nlen)       :: tmp_fname_srf_cam 
     !-----------------------------------------------------------------------
 
     ! Determine and open surface restart dataset
diff --git a/driver-moab/main/cime_comp_mod.F90 b/driver-moab/main/cime_comp_mod.F90
@@ -5376,7 +5376,6 @@ subroutine cime_run_write_restart(drv_pause, write_restart, drv_resume_file)
     logical         , intent(in)    :: drv_pause
     logical         , intent(in)    :: write_restart
     character(len=*), intent(inout) :: drv_resume_file ! Driver resets state from restart file
-    character(len=CL) :: drv_moab_resume_file ! use a different file for moab; do not overwrite the regular name
 
 103 format( 5A )
 104 format( A, i10.8, i8)
@@ -5393,21 +5392,13 @@ subroutine cime_run_write_restart(drv_pause, write_restart, drv_resume_file)
              call shr_sys_flush(logunit)
           endif
 
-          call t_startf('CPL:seq_rest_write')
-          call seq_rest_write(EClock_d, seq_SyncClock, infodata,       &
-               atm, lnd, ice, ocn, rof, glc, wav, esp, iac,            &
-               fractions_ax, fractions_lx, fractions_ix, fractions_ox, &
-               fractions_rx, fractions_gx, fractions_wx, fractions_zx, &
-               trim(cpl_inst_tag), drv_resume_file)
-          call t_stopf('CPL:seq_rest_write')
-
 #ifdef MOABDEBUG
           call write_moab_state( .true. )
 #endif
           call t_startf('CPL:seq_rest_mb_write')
           call seq_rest_mb_write(EClock_d, seq_SyncClock, infodata,       &
                atm, lnd, ice, ocn, rof, glc, wav, esp, iac,            &
-               trim(cpl_inst_tag), samegrid_al, samegrid_lr, drv_moab_resume_file)
+               trim(cpl_inst_tag), samegrid_al, samegrid_lr, drv_resume_file)
           call t_stopf('CPL:seq_rest_mb_write')
 
           if (iamroot_CPLID) then
diff --git a/driver-moab/main/component_mod.F90 b/driver-moab/main/component_mod.F90
@@ -788,7 +788,7 @@ subroutine component_init_areacor_moab (comp, mbccid, mbcxid, seq_flds_c2x_fluxe
          ! get areas
          tagname='area:aream:mask'//C_NULL_CHAR
          arrsize = 3 * lsize
-         ierr = iMOAB_GetDoubleTagStorage ( mbccid, tagname, arrsize , comp(1)%mbGridType, areas )
+         ierr = iMOAB_GetDoubleTagStorage ( mbccid, tagname, arrsize , comp(1)%mbGridType, areas(1,1) )
          if (ierr .ne. 0) then
            call shr_sys_abort(subname//' cannot get areas  ')
          endif
@@ -820,7 +820,7 @@ subroutine component_init_areacor_moab (comp, mbccid, mbcxid, seq_flds_c2x_fluxe
            call shr_sys_abort(subname//' cannot define correction tags')
          endif
          arrsize = 2 * lsize
-         ierr = iMOAB_SetDoubleTagStorage( mbccid, tagname, arrsize , comp(1)%mbGridType, factors)
+         ierr = iMOAB_SetDoubleTagStorage( mbccid, tagname, arrsize , comp(1)%mbGridType, factors(1,1))
          if (ierr .ne. 0) then
            call shr_sys_abort(subname//' cannot set correction area factors  ')
          endif
@@ -854,7 +854,7 @@ subroutine component_init_areacor_moab (comp, mbccid, mbcxid, seq_flds_c2x_fluxe
          allocate(vals(lsize, nfields))
          tagname = trim(seq_flds_c2x_fluxes)//C_NULL_CHAR
          arrsize = lsize * nfields
-         ierr = iMOAB_GetDoubleTagStorage( mbccid, tagname, arrsize, comp(1)%mbGridType, vals )
+         ierr = iMOAB_GetDoubleTagStorage( mbccid, tagname, arrsize, comp(1)%mbGridType, vals(1,1) )
          if (ierr .ne. 0) then
            call shr_sys_abort(subname//' cannot get flux values:  '//tagname)
          endif
@@ -868,7 +868,7 @@ subroutine component_init_areacor_moab (comp, mbccid, mbcxid, seq_flds_c2x_fluxe
                enddo
             endif
          enddo
-         ierr = iMOAB_SetDoubleTagStorage( mbccid, tagname, arrsize, comp(1)%mbGridType, vals)
+         ierr = iMOAB_SetDoubleTagStorage( mbccid, tagname, arrsize, comp(1)%mbGridType, vals(1,1))
          if (ierr .ne. 0) then
             call shr_sys_abort(subname//' cannot set new flux values  ')
          endif
@@ -1267,7 +1267,7 @@ subroutine factor_moab_comp(comp, type, seq_flds_fluxes, mask_spval)
       ! get vals, multiply, then reset them again
       tagname = trim(seq_flds_fluxes)//C_NULL_CHAR
       arrsize = comp%mblsize * nfields
-      ierr = iMOAB_GetDoubleTagStorage( comp%mbApCCid, tagname, arrsize , comp%mbGridType, vals)
+      ierr = iMOAB_GetDoubleTagStorage( comp%mbApCCid, tagname, arrsize , comp%mbGridType, vals(1,1))
       if (ierr .ne. 0) then
          call shr_sys_abort(subname//' cannot get fluxes  ' //trim(type))
       endif
diff --git a/driver-moab/main/seq_rest_mod.F90 b/driver-moab/main/seq_rest_mod.F90
@@ -398,7 +398,8 @@ subroutine seq_rest_mb_read(rest_file, infodata, samegrid_al, samegrid_lr)
     !
     !-------------------------------------------------------------------------------
     ! actual moab name is
-    moab_rest_file = 'moab_'//trim(rest_file)
+    !moab_rest_file = 'moab_'//trim(rest_file)
+    moab_rest_file = trim(rest_file) 
     !----------------------------------------------------------------------------
     ! get required infodata
     !----------------------------------------------------------------------------
@@ -641,7 +642,7 @@ subroutine seq_rest_write(EClock_d, seq_SyncClock, infodata, &
        atm, lnd, ice, ocn, rof, glc, wav, esp, iac,            &
        fractions_ax, fractions_lx, fractions_ix, fractions_ox, &
        fractions_rx, fractions_gx, fractions_wx, fractions_zx, &
-       tag, rest_file)
+       tag, rest_file_org)
 
     implicit none
 
@@ -666,7 +667,9 @@ subroutine seq_rest_write(EClock_d, seq_SyncClock, infodata, &
     type(mct_aVect)        , intent(inout) :: fractions_wx(:)   ! Fractions on wav grid/decomp
     type(mct_aVect)        , intent(inout) :: fractions_zx(:)   ! Fractions on iac grid/decomp
     character(len=*)       , intent(in)    :: tag
-    character(len=CL)      , intent(out)   :: rest_file         ! Restart filename
+    character(len=CL)      , intent(out)   :: rest_file_org         ! Restart filename
+
+    character(len=CL)                      :: rest_file   !  pre-pend with mct_
 
     integer(IN)   :: n,n1,n2,n3,fk
     integer(IN)   :: curr_ymd         ! Current date YYYYMMDD
@@ -736,9 +739,13 @@ subroutine seq_rest_write(EClock_d, seq_SyncClock, infodata, &
     call seq_timemgr_EClockGetData( EClock_d, curr_ymd=curr_ymd, curr_tod=curr_tod)
     call shr_cal_date2ymd(curr_ymd,yy,mm,dd)
     write(year_char,'(i6.4)') yy
-    write(rest_file,"(4a,i2.2,a,i2.2,a,i5.5,a)") &
+    write(rest_file_org,"(4a,i2.2,a,i2.2,a,i5.5,a)") &
          trim(case_name), '.cpl'//trim(tag)//'.r.',trim(adjustl(year_char)),'-',mm,'-',dd,'-',curr_tod,'.nc'
 
+    rest_file = 'mct_'//trim(rest_file_org) ! will actually write here, and return the original name
+    ! moab will write the original one, and read the original one; mct will read the original too
+    ! for the time being, read twice, the same file;; comapre mct_ one with original one to see how different 
+    ! they are ! tehy should be no different
     ! Write driver data to restart file
 
     if (iamin_CPLID) then
@@ -785,7 +792,7 @@ subroutine seq_rest_write(EClock_d, seq_SyncClock, infodata, &
           if (loglevel > 0) write(logunit,"(3A)") subname," write rpointer file ", &
                trim(cvar)
           open(iun, file=cvar, form='FORMATTED')
-          write(iun,'(a)') rest_file
+          write(iun,'(a)') rest_file_org ! will write to rpointer file the origname, not the one with mct in it
           close(iun)
           call shr_file_freeUnit( iun )
        endif
@@ -1061,7 +1068,8 @@ subroutine seq_rest_mb_write(EClock_d, seq_SyncClock, infodata,       &
     call shr_cal_date2ymd(curr_ymd,yy,mm,dd)
     write(year_char,'(i6.4)') yy
     write(rest_file,"(4a,i2.2,a,i2.2,a,i5.5,a)") &
-         'moab_'//trim(case_name), '.cpl'//trim(tag)//'.r.',trim(adjustl(year_char)),'-',mm,'-',dd,'-',curr_tod,'.nc'
+        trim(case_name), '.cpl'//trim(tag)//'.r.',trim(adjustl(year_char)),'-',mm,'-',dd,'-',curr_tod,'.nc'
+       !  'moab_'//trim(case_name), '.cpl'//trim(tag)//'.r.',trim(adjustl(year_char)),'-',mm,'-',dd,'-',curr_tod,'.nc'
 
     ! Write driver data to restart file
 
@@ -1103,16 +1111,16 @@ subroutine seq_rest_mb_write(EClock_d, seq_SyncClock, infodata,       &
           enddo
        endif
 
-!       if (cplroot) then
-!          iun = shr_file_getUnit()
-!          call seq_infodata_GetData(infodata,restart_pfile=cvar)
-!          if (loglevel > 0) write(logunit,"(3A)") subname," write rpointer file ", &
-!               trim(cvar)
-!          open(iun, file=cvar, form='FORMATTED')
-!          write(iun,'(a)') rest_file
-!          close(iun)
-!          call shr_file_freeUnit( iun )
-!       endif
+       if (cplroot) then
+         iun = shr_file_getUnit()
+         call seq_infodata_GetData(infodata,restart_pfile=cvar)
+         if (loglevel > 0) write(logunit,"(3A)") subname," write rpointer file ", &
+            trim(cvar)
+         open(iun, file=cvar, form='FORMATTED')
+         write(iun,'(a)') rest_file
+         close(iun)
+         call shr_file_freeUnit( iun )
+       endif
 
        call shr_mpi_bcast(rest_file,mpicom_CPLID)
        call seq_io_wopen(rest_file,clobber=.true., model_doi_url=model_doi_url)
