Revive spectral mesh coupling in driver-moab

components/eam/src/cpl/atm_comp_mct.F90

@@ -504,12 +504,15 @@ 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
+
+#ifdef HAVE_MOAB
+          call t_startf('atm_read_srfrest_moab')
+          call atm_read_srfrest_moab ( EClock )
+          call t_stopf('atm_read_srfrest_moab')
+#else
           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

components/eam/src/dynamics/se/dyn_comp.F90

@@ -106,7 +106,7 @@ subroutine dyn_init1(fh, NLFileName, dyn_in, dyn_out)
     use seq_comm_mct,      only: MHID, MHFID  ! id of homme moab coarse and fine applications
     use seq_comm_mct,      only: ATMID
     use seq_comm_mct,      only: mhpgid       ! id of pgx moab application
-    use semoab_mod,        only: create_moab_meshes
+    use semoab_mod,        only: create_moab_pg_mesh
     use iMOAB, only : iMOAB_RegisterApplication
     use iso_c_binding 
 #endif
@@ -269,7 +269,7 @@ subroutine dyn_init1(fh, NLFileName, dyn_in, dyn_out)
     end if
 
 #ifdef HAVE_MOAB
-    call create_moab_meshes(par, elem, fv_nphys)
+    call create_moab_pg_mesh(par, elem, fv_nphys)
 #endif
     ! Define the CAM grids (this has to be after dycore spinup).
     ! Physics-grid will be defined later by phys_grid_init

components/eamxx/src/dynamics/homme/interface/phys_grid_mod.F90

@@ -552,7 +552,7 @@ subroutine phys_grid_init (pgN)
     use seq_comm_mct,      only: MHID, MHFID  ! id of homme moab coarse and fine applications
     use seq_comm_mct,      only: ATMID
     use seq_comm_mct,      only: mhpgid       ! id of pgx moab application
-    use semoab_mod,        only: create_moab_meshes
+    use semoab_mod,        only: create_moab_pg_mesh
     use iMOAB, only : iMOAB_RegisterApplication
     use iso_c_binding
 #endif
@@ -625,45 +625,45 @@ subroutine phys_grid_init (pgN)
     call compute_global_area (pg)
 #ifdef HAVE_MOAB
     if (pgN > 0) then
-       appname="HM_COARSE"//C_NULL_CHAR
-       ATM_ID1 = 120 !
-       ierr = iMOAB_RegisterApplication(appname, par%comm, ATM_ID1, MHID)
-       if (ierr > 0 )  &
-       call abortmp('Error: cannot register moab app')
-       if(par%masterproc) then
-           write(iulog,*) " "
-           write(iulog,*) "register MOAB app:", trim(appname), "  MHID=", MHID
-           write(iulog,*) " "
-       endif
-       appname="HM_FINE"//C_NULL_CHAR
-       ATM_ID1 = 119 ! this number should not conflict with other components IDs; how do we know?
-       ierr = iMOAB_RegisterApplication(appname, par%comm, ATM_ID1, MHFID)
-       if (ierr > 0 )  &
-       call abortmp('Error: cannot register moab app for fine mesh')
-       if(par%masterproc) then
-           write(iulog,*) " "
-           write(iulog,*) "register MOAB app:", trim(appname), "  MHFID=", MHFID
-           write(iulog,*) " "
-       endif
-         appname="HM_PGX"//C_NULL_CHAR
-         ATM_ID1 =  ATMID(1) ! this number should not conflict with other components IDs; how do we know?
-         !
-         ! in this case, we reuse the main atm id, mhid will not be used for intersection anymore
-         ! still, need to be careful
-         ierr = iMOAB_RegisterApplication(appname, par%comm, ATM_ID1, mhpgid)
-         if (ierr > 0 )  &
-             call abortmp('Error: cannot register moab app for fine mesh')
-         if(par%masterproc) then
-             write(iulog,*) " "
-             write(iulog,*) "register MOAB app:", trim(appname), "  MHPGID=", mhpgid
-             write(iulog,*) " "
-         endif
+        appname="HM_COARSE"//C_NULL_CHAR
+        ATM_ID1 = 120 !
+        ierr = iMOAB_RegisterApplication(appname, par%comm, ATM_ID1, MHID)
+        if (ierr > 0 )  &
+        call abortmp('Error: cannot register moab app')
+        if(par%masterproc) then
+            write(iulog,*) " "
+            write(iulog,*) "register MOAB app:", trim(appname), "  MHID=", MHID
+            write(iulog,*) " "
+        endif
+        appname="HM_FINE"//C_NULL_CHAR
+        ATM_ID1 = 119 ! this number should not conflict with other components IDs; how do we know?
+        ierr = iMOAB_RegisterApplication(appname, par%comm, ATM_ID1, MHFID)
+        if (ierr > 0 )  &
+        call abortmp('Error: cannot register moab app for fine mesh')
+        if(par%masterproc) then
+            write(iulog,*) " "
+            write(iulog,*) "register MOAB app:", trim(appname), "  MHFID=", MHFID
+            write(iulog,*) " "
+        endif
+        appname="HM_PGX"//C_NULL_CHAR
+        ATM_ID1 =  ATMID(1) ! this number should not conflict with other components IDs; how do we know?
+        !
+        ! in this case, we reuse the main atm id, mhid will not be used for intersection anymore
+        ! still, need to be careful
+        ierr = iMOAB_RegisterApplication(appname, par%comm, ATM_ID1, mhpgid)
+        if (ierr > 0 )  &
+            call abortmp('Error: cannot register moab app for fine mesh')
+        if(par%masterproc) then
+            write(iulog,*) " "
+            write(iulog,*) "register MOAB app:", trim(appname), "  MHPGID=", mhpgid
+            write(iulog,*) " "
+        endif
 ! instance distributed moab meshes from elem structures
 !    1 ) spectral coarse mesh
 !    2 ) GLL fine quad mesh (used mostly for visualization)
 !    3 ) pgN FV type mesh, (most of the time pg2 mesh), used for coupling with other components;
-       call create_moab_meshes(par, elem, pgN)
-     endif
+        call create_moab_pg_mesh(par, elem, pgN)
+    endif
 #endif
   end subroutine phys_grid_init