@@ -453,7 +453,6 @@ void main_main ()
453453
454454 // Evolve H_demag
455455 if (demag_coupling == 1 ) {
456- // demag_solver.CalculateH_demag(Mfield_old, H_demagfield);
457456 if (ml_enable == 1 ) {
458457#ifdef AMREX_USE_ML
459458 for (amrex::MFIter mfi (Mfield_old[0 ], amrex::TilingIfNotGPU ());
@@ -475,16 +474,7 @@ void main_main ()
475474 }
476475#endif
477476 } else {
478- // demag_solver.CalculateH_demag(Mfield_old, H_demagfield);
479- amrex::Gpu::streamSynchronize ();
480- double start_time = amrex::second ();
481-
482477 demag_solver.CalculateH_demag (Mfield_old, H_demagfield);
483-
484- amrex::Gpu::streamSynchronize ();
485- double end_time = amrex::second ();
486-
487- amrex::Print () << " Demag Solver Time: " << (end_time - start_time) * 1000.0 << " ms" << std::endl;
488478 }
489479 }
490480
@@ -603,7 +593,6 @@ void main_main ()
603593
604594 // Poisson solve and H_demag computation with Mfield
605595 if (demag_coupling == 1 ) {
606- // demag_solver.CalculateH_demag(Mfield, H_demagfield);
607596 if (ml_enable == 1 ) {
608597#ifdef AMREX_USE_ML
609598 for (amrex::MFIter mfi (Mfield_old[0 ], amrex::TilingIfNotGPU ());
@@ -625,16 +614,7 @@ void main_main ()
625614 }
626615#endif
627616 } else {
628- // demag_solver.CalculateH_demag(Mfield, H_demagfield);
629- amrex::Gpu::streamSynchronize ();
630- double start_time = amrex::second ();
631-
632617 demag_solver.CalculateH_demag (Mfield, H_demagfield);
633-
634- amrex::Gpu::streamSynchronize ();
635- double end_time = amrex::second ();
636-
637- amrex::Print () << " Demag Solver Time: " << (end_time - start_time) * 1000.0 << " ms" << std::endl;
638618 }
639619
640620 }
@@ -739,7 +719,11 @@ void main_main ()
739719 H_demagfield[idim].setVal (0 .);
740720 }
741721 } else {
742- demag_solver.CalculateH_demag (ar_state, H_demagfield);
722+ if (ml_enable == 1 ) {
723+ amrex::Abort (" add ML demag to SUNDIALS rhs" );
724+ } else {
725+ demag_solver.CalculateH_demag (ar_state, H_demagfield);
726+ }
743727 }
744728 }
745729
@@ -814,7 +798,6 @@ void main_main ()
814798 // H_demag
815799 if (demag_coupling == 1 ) {
816800 if (fast_demag==1 ) {
817- // demag_solver.CalculateH_demag(ar_state, H_demagfield);
818801 if (ml_enable == 1 ) {
819802 amrex::Abort (" add ML demag to fast dynamics" );
820803 } else {
@@ -899,7 +882,11 @@ void main_main ()
899882 // H_demag
900883 if (demag_coupling == 1 ) {
901884 if (implicit_demag==1 ) {
902- demag_solver.CalculateH_demag (ar_state, H_demagfield);
885+ if (ml_enable == 1 ) {
886+ amrex::Abort (" ML demag for implicit not supported" );
887+ } else {
888+ demag_solver.CalculateH_demag (ar_state, H_demagfield);
889+ }
903890 } else {
904891 for (int idim=0 ; idim<AMREX_SPACEDIM; ++idim) {
905892 H_demagfield[idim].setVal (0 .);
0 commit comments