From 7bf8ade3f9168e9bacfa437a097f9416140ef4f7 Mon Sep 17 00:00:00 2001
From: Eric Winter <eric.winter@jhuapl.edu>
Date: Tue, 29 Jul 2025 12:51:34 -0600
Subject: [PATCH] More raiju changes from Jeff.

---
 testingScripts/relativeCaseGo-template.xml | 19 +++++++++++-------
 testingScripts/tinyCase.xml                | 19 +++++++++++-------
 tests/voltron/cmriD_Earth.xml              | 21 +++++++++++---------
 tests/voltron/cmriD_Jupiter.xml            | 21 +++++++++++---------
 tests/voltron/cmriD_NewPlanet.xml          | 21 +++++++++++---------
 tests/voltron/testrcm.pf                   |  3 ++-
 tests/voltron_mpi/cmiD_deep_1.xml          | 20 +++++++++++--------
 tests/voltron_mpi/cmiD_deep_4.xml          | 20 +++++++++++--------
 tests/voltron_mpi/cmiD_deep_8.xml          | 20 +++++++++++--------
 tests/voltron_mpi/cmiD_deep_8_genRes.xml   | 20 +++++++++++--------
 tests/voltron_mpi/cmiD_deep_8_res0.xml     | 20 +++++++++++--------
 tests/voltron_mpi/cmiD_deep_8_res60.xml    | 20 +++++++++++--------
 tests/voltron_mpi/cmiD_deep_8_res600.xml   | 20 +++++++++++--------
 tests/voltron_mpi/geo_mpi.xml              | 19 +++++++++++-------
 tests/voltron_mpi/testHelpersSquish_4.xml  | 23 ++++++----------------
 tests/voltron_mpi/testHelpersStep_4.xml    | 20 +++++++++++--------
 tests/voltron_mpi/testHelpersTubes_4.xml   | 23 ++++++----------------
 tests/voltron_mpi/testebmpi.pf             |  3 ++-
 18 files changed, 184 insertions(+), 148 deletions(-)

diff --git a/testingScripts/relativeCaseGo-template.xml b/testingScripts/relativeCaseGo-template.xml
index 5e9f8f59..bb9e903a 100644
--- a/testingScripts/relativeCaseGo-template.xml
+++ b/testingScripts/relativeCaseGo-template.xml
@@ -5,7 +5,7 @@
     <time tFin="7201.0"/>
     <spinup doSpin="T" tSpin="3600.0"/>
     <output dtOut="60.0" tsOut="100"/>
-    <coupling dtCouple="5.0" imType="RCM" doQkSquish="F" qkSquishStride="2" doAsyncCoupling="F" doSerial="{{ serial_coupling }}"/>
+    <coupling dtCouple="5.0" imType="RAIJU" doQkSquish="F" qkSquishStride="2" doAsyncCoupling="F" doSerial="{{ serial_coupling }}"/>
     <restart dtRes="3600.0"/>
     <imag doInit="T"/>
     <threading NumTh="128"/>
@@ -37,10 +37,15 @@
     <conductance doStarlight="T" doRamp="F"/>
     <precipitation aurora_model_type="LINMRG" alpha="0.2" beta="0.4" doAuroralSmooth="F"/>
   </REMIX>
-  <RCM>
-    <rcmdomain domType="ELLIPSE"/>
-    <ellipse xSun="12.5" yDD="15.0" xTail="-20.0" isDynamic="T"/>
-    <grid LowLat="30.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="2" doRefill="T" tAvg="600.0"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/testingScripts/tinyCase.xml b/testingScripts/tinyCase.xml
index 90855ba9..da449373 100644
--- a/testingScripts/tinyCase.xml
+++ b/testingScripts/tinyCase.xml
@@ -5,7 +5,7 @@
     <time tFin="11.5"/>
     <spinup doSpin="T" tSpin="5.0"/>
     <output dtOut="300.0" tsOut="100"/>
-    <coupling dtCouple="5.0" imType="RCM" doQkSquish="T" qkSquishStride="2" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" imType="RAIJU" doQkSquish="T" qkSquishStride="2" doAsyncCoupling="F"/>
     <restart dtRes="10800.0"/>
     <imag doInit="T"/>
     <threading NumTh="128"/>
@@ -36,11 +36,16 @@
     <conductance doStarlight="T" doRamp="F"/>
     <precipitation aurora_model_type="LINMRG" alpha="0.2" beta="0.4" doAuroralSmooth="F"/>
   </REMIX>
-  <RCM>
-    <rcmdomain domType="ELLIPSE"/>
-    <ellipse xSun="12.5" yDD="15.0" xTail="-20.0" isDynamic="T"/>
-    <grid LowLat="30.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="2" doRefill="T" tAvg="600.0"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
 
diff --git a/tests/voltron/cmriD_Earth.xml b/tests/voltron/cmriD_Earth.xml
index a86526c0..bcb8365d 100644
--- a/tests/voltron/cmriD_Earth.xml
+++ b/tests/voltron/cmriD_Earth.xml
@@ -4,7 +4,7 @@
     <time tFin="108000.2"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0" doSeq="F"/>
     <output dtOut="30.0" tsOut="100"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="F" qkSquishStride="2"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="F" qkSquishStride="2"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -33,12 +33,15 @@
     <conductance doStarlight="T" doRamp="F" doMR="F"/>
     <precipitation aurora_model_type="LINMRG" alpha="0.2" beta="0.4" doAuroralSmooth="F"/>
   </REMIX>
-  <RCM>
-    <ellipse xSun="12.5" yDD="15.0" xTail="-15.0" isDynamic="T"/>
-    <grid LowLat="30.0" HiLat="75.0" doLatStretch="F"/>
-    <torcm doFluidSplit="F"/>
-    <tomhd doAvg2MHD="T"/>
-    <plasmasphere isDynamic="T" initKp="3" doRefill="T" DenPP0="1.0" staticR="2" tAvg="300.0"/>
-    <loss doRelax="F" doNewCX="T"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron/cmriD_Jupiter.xml b/tests/voltron/cmriD_Jupiter.xml
index d27e978d..93c92230 100644
--- a/tests/voltron/cmriD_Jupiter.xml
+++ b/tests/voltron/cmriD_Jupiter.xml
@@ -4,7 +4,7 @@
     <time tFin="108000.2"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0" doSeq="F"/>
     <output dtOut="30.0" tsOut="100"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="F" qkSquishStride="2"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="F" qkSquishStride="2"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -33,12 +33,15 @@
     <conductance doStarlight="T" doRamp="F" doMR="F"/>
     <precipitation aurora_model_type="LINMRG" alpha="0.2" beta="0.4" doAuroralSmooth="F"/>
   </REMIX>
-  <RCM>
-    <ellipse xSun="12.5" yDD="15.0" xTail="-15.0" isDynamic="T"/>
-    <grid LowLat="30.0" HiLat="75.0" doLatStretch="F"/>
-    <torcm doFluidSplit="F"/>
-    <tomhd doAvg2MHD="T"/>
-    <plasmasphere isDynamic="T" initKp="3" doRefill="T" DenPP0="1.0" staticR="2" tAvg="300.0"/>
-    <loss doRelax="F" doNewCX="T"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron/cmriD_NewPlanet.xml b/tests/voltron/cmriD_NewPlanet.xml
index c5392bea..ffdb021f 100644
--- a/tests/voltron/cmriD_NewPlanet.xml
+++ b/tests/voltron/cmriD_NewPlanet.xml
@@ -4,7 +4,7 @@
     <time tFin="108000.2"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0" doSeq="F"/>
     <output dtOut="30.0" tsOut="100"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="F" qkSquishStride="2"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="F" qkSquishStride="2"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -33,12 +33,15 @@
     <conductance doStarlight="T" doRamp="F" doMR="F"/>
     <precipitation aurora_model_type="LINMRG" alpha="0.2" beta="0.4" doAuroralSmooth="F"/>
   </REMIX>
-  <RCM>
-    <ellipse xSun="12.5" yDD="15.0" xTail="-15.0" isDynamic="T"/>
-    <grid LowLat="30.0" HiLat="75.0" doLatStretch="F"/>
-    <torcm doFluidSplit="F"/>
-    <tomhd doAvg2MHD="T"/>
-    <plasmasphere isDynamic="T" initKp="3" doRefill="T" DenPP0="1.0" staticR="2" tAvg="300.0"/>
-    <loss doRelax="F" doNewCX="T"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron/testrcm.pf b/tests/voltron/testrcm.pf
index f03031b4..7b89e283 100644
--- a/tests/voltron/testrcm.pf
+++ b/tests/voltron/testrcm.pf
@@ -16,7 +16,8 @@ contains
   subroutine lastSerial()
   end subroutine lastSerial
 
-  @test
+  ! no more rcm, no more rcm test
+  !@test
   subroutine testRcmFakeTubes()
     ! testing that rcm produces expected output when debug tubes is enabled
     type(voltApp_T) :: voltronApp
diff --git a/tests/voltron_mpi/cmiD_deep_1.xml b/tests/voltron_mpi/cmiD_deep_1.xml
index 420eb79f..303d66d4 100644
--- a/tests/voltron_mpi/cmiD_deep_1.xml
+++ b/tests/voltron_mpi/cmiD_deep_1.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="677.115987461"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -37,11 +37,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/cmiD_deep_4.xml b/tests/voltron_mpi/cmiD_deep_4.xml
index 6f05dd20..d8f1e0e1 100644
--- a/tests/voltron_mpi/cmiD_deep_4.xml
+++ b/tests/voltron_mpi/cmiD_deep_4.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="677.115987461"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -38,11 +38,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/cmiD_deep_8.xml b/tests/voltron_mpi/cmiD_deep_8.xml
index c411d8f4..6327cbde 100644
--- a/tests/voltron_mpi/cmiD_deep_8.xml
+++ b/tests/voltron_mpi/cmiD_deep_8.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="677.115987461"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -38,11 +38,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/cmiD_deep_8_genRes.xml b/tests/voltron_mpi/cmiD_deep_8_genRes.xml
index ff3c59ed..131e8593 100644
--- a/tests/voltron_mpi/cmiD_deep_8_genRes.xml
+++ b/tests/voltron_mpi/cmiD_deep_8_genRes.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="601.0"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="60.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -38,11 +38,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/cmiD_deep_8_res0.xml b/tests/voltron_mpi/cmiD_deep_8_res0.xml
index ee08425d..39a289bb 100644
--- a/tests/voltron_mpi/cmiD_deep_8_res0.xml
+++ b/tests/voltron_mpi/cmiD_deep_8_res0.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="677.115987461"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -38,11 +38,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/cmiD_deep_8_res60.xml b/tests/voltron_mpi/cmiD_deep_8_res60.xml
index 8b49bcd7..1444c241 100644
--- a/tests/voltron_mpi/cmiD_deep_8_res60.xml
+++ b/tests/voltron_mpi/cmiD_deep_8_res60.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="677.115987461"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -38,11 +38,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/cmiD_deep_8_res600.xml b/tests/voltron_mpi/cmiD_deep_8_res600.xml
index affa5479..a9fd6729 100644
--- a/tests/voltron_mpi/cmiD_deep_8_res600.xml
+++ b/tests/voltron_mpi/cmiD_deep_8_res600.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="677.115987461"/>
     <spinup doSpin="T" tSpin="60.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="T" doDynDT="T" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -38,11 +38,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/geo_mpi.xml b/tests/voltron_mpi/geo_mpi.xml
index c19a7b14..6f3150c2 100644
--- a/tests/voltron_mpi/geo_mpi.xml
+++ b/tests/voltron_mpi/geo_mpi.xml
@@ -1,10 +1,4 @@
 <Kaiju>
-  <RCM>
-    <rcmdomain domType="ELLIPSE" />
-    <ellipse isDynamic="T" xSun="12.5" xTail="-20.0" yDD="15.0" />
-    <grid HiLat="75.0" LowLat="30.0" doLatStretch="F" />
-    <plasmasphere DenPP0="1.0e-2" doRefill="T" initKp="2" isDynamic="T" tAvg="600.0" />
-  </RCM>
   <CHIMP>
     <units uid="EARTHCODE" />
     <fields grType="lfm" />
@@ -15,7 +9,7 @@
     <time tFin="3600.0" />
     <spinup doSpin="T" tSpin="3600.0" />
     <output dtOut="900.0" tsOut="100" />
-    <coupling doQkSquish="T" dtCouple="5.0" imType="RCM" qkSquishStride="2" rTrc="40.0" doAsyncCoupling="F" />
+    <coupling doQkSquish="T" dtCouple="5.0" imType="RAIJU" qkSquishStride="2" rTrc="40.0" doAsyncCoupling="F" />
     <restart dtRes="1800.0" />
     <imag doInit="T" />
     <ebsquish epsSquish="0.05" />
@@ -39,4 +33,15 @@
     <conductance doRamp="F" doStarlight="T" />
     <precipitation alpha="0.2" aurora_model_type="LINMRG" beta="0.4" />
   </REMIX>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/testHelpersSquish_4.xml b/tests/voltron_mpi/testHelpersSquish_4.xml
index 0c718413..3bd7afc3 100644
--- a/tests/voltron_mpi/testHelpersSquish_4.xml
+++ b/tests/voltron_mpi/testHelpersSquish_4.xml
@@ -39,26 +39,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
-  <RAIJU>
-    <driver isSA="F"/>
-    <restart doRes="T" nRes="18"/>
-    <output doFat="F"/>
-    <debug isLoud="T" writeGhosts="F" debugOutput="T"/>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
     <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
     <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
-    <sim pdmb="0.75" useVelLRs="T"/>
-    <activeShell doAS="F"/>
-    <config fname="raijuconfig.h5" ignoreMismatch="F"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
     <plasmasphere doPsphere="T" doExcessMap="T"/>
-    <losses doLosses="T" doCX="T" doSS="T" doCC="T" eLossModel="WM" doOutput="T"/>
-    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.00" bminThresh="1.0" Pstd="100.0" normAngThresh="180.0"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
     <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
   </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/testHelpersStep_4.xml b/tests/voltron_mpi/testHelpersStep_4.xml
index f848b9ad..864ef5c7 100644
--- a/tests/voltron_mpi/testHelpersStep_4.xml
+++ b/tests/voltron_mpi/testHelpersStep_4.xml
@@ -4,7 +4,7 @@
   <voltron>
     <time tFin="21.0"/>
     <spinup doSpin="T" tSpin="20.0" tIO="0.0"/>
-    <coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="F" doDynDT="F" doAsyncCoupling="F"/>
+    <coupling dtCouple="5.0" rTrc="40.0" imType="RAIJU" doQkSquish="F" doDynDT="F" doAsyncCoupling="F"/>
     <restart dtRes="1800.0"/>
     <imag doInit="T"/>
     <ebsquish epsSquish="0.05"/>
@@ -39,11 +39,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
+    <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
+    <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
+    <plasmasphere doPsphere="T" doExcessMap="T"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
+    <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
+  </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/testHelpersTubes_4.xml b/tests/voltron_mpi/testHelpersTubes_4.xml
index c45e5394..c4d34d15 100644
--- a/tests/voltron_mpi/testHelpersTubes_4.xml
+++ b/tests/voltron_mpi/testHelpersTubes_4.xml
@@ -39,26 +39,15 @@
     <domain dtype="MAGE"/>
     <tracer epsds="0.05"/>
   </CHIMP>
-  <RCM>
-    <output debug="F" toRCM="F" toMHD="F"/>
-    <clawpack doKaiClaw="F" doOMPClaw="T"/>
-    <ellipse xSun="10.0" yDD="12.5" xTail="-15.0" isDynamic="F"/>
-    <grid LowLat="25.0" HiLat="75.0" doLatStretch="F"/>
-    <plasmasphere isDynamic="T" initKp="1"/>
-  </RCM>
-  <RAIJU>
-    <driver isSA="F"/>
-    <restart doRes="T" nRes="18"/>
-    <output doFat="F"/>
-    <debug isLoud="T" writeGhosts="F" debugOutput="T"/>
+   <RAIJU>
+    <output loudConsole="T" doFat="F" doLossExtras="F" doDebug="F" writeGhosts="F"/>
     <grid gType="SHGRID" ThetaL="15" ThetaU="50"/>
     <domain tail_buffer="15.0" sun_buffer="15.0" tail_active="12.0" sun_active="12.0"/>
-    <sim pdmb="0.75" useVelLRs="T"/>
-    <activeShell doAS="F"/>
-    <config fname="raijuconfig.h5" ignoreMismatch="F"/>
+    <sim pdmb="0.75"/>
+    <config fname="raijuconfig.h5"/>
     <plasmasphere doPsphere="T" doExcessMap="T"/>
-    <losses doLosses="T" doCX="T" doSS="T" doCC="T" eLossModel="WM" doOutput="T"/>
-    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.00" bminThresh="1.0" Pstd="100.0" normAngThresh="180.0"/>
+    <losses doLosses="T" doCX="T" doSS="T" doCC="T"/>
+    <cpl nFluidsIn="1" startupTscl="7200.0" vaFracThresh="0.60" bminThresh="5.0" Pstd="5.0" normAngThresh="180.0"/>
     <fluidIn1 imhd="0" flav="2" excessToPsph="T"/>
   </RAIJU>
 </Kaiju>
diff --git a/tests/voltron_mpi/testebmpi.pf b/tests/voltron_mpi/testebmpi.pf
index 5d06d45e..9eaf1bd7 100644
--- a/tests/voltron_mpi/testebmpi.pf
+++ b/tests/voltron_mpi/testebmpi.pf
@@ -124,7 +124,8 @@ contains
 
   end subroutine
 
-  @test(npes=[2,5,9])
+  ! not supported without RCM
+  !@test(npes=[2,5,9])
   subroutine VMPIsquishDipoleTest(this)
       class (MpiTestMethod), intent(inout) :: this