Fixing mpi library differences, gfortran differences, helio IC bug, derecho testing XML mods

This commit is contained in:
Jeffrey Garretson
2024-08-13 17:27:03 -06:00
parent 70368f0340
commit 5619a40328
19 changed files with 85 additions and 15 deletions

View File

@@ -30,6 +30,6 @@ printenv
echo 'Generating data for testing.'
MPICOMMAND="mpiexec $KAIJUHOME/scripts/preproc/pinCpuCores.sh"
$MPICOMMAND ./voltron_mpi.x geo_mpi.xml >& geo_mpi.out
$MPICOMMAND ./voltron_mpi.x cmiD_deep_8_genRes.xml >& cmiD_deep_8_genRes.out
echo "Job $PBS_JOBID ended at `date` on `hostname` in directory `pwd`."

View File

@@ -34,6 +34,6 @@ echo 'The active environment variables are:'
printenv
echo 'Generating data for testing.'
$MPICOMMAND ./voltron_mpi.x geo_mpi.xml > geo_mpi.out
$MPICOMMAND ./voltron_mpi.x cmiD_deep_8_genRes.xml > cmiD_deep_8_genRes.out
echo "Job $PBS_JOBID ended at `date` on `hostname` in directory `pwd`."

31
tests/rcm/cmriD.xml Normal file
View File

@@ -0,0 +1,31 @@
<!-- Example XML file for coupled SST+Gamera+ReMIX+CHIMP -->
<?xml version="1.0"?>
<!-- Magnetosphere params, Voltron times in seconds -->
<Kaiju>
<VOLTRON>
<time tFin="36000.0"/>
<output dtOut="60.0" tsOut="100" doTimer="F"/>
<restart dtRes="1800.0"/>
<coupling dtCouple="5.0" rDeep="8.0" imType="RCM"/>
</VOLTRON>
<Gamera>
<sim runid="msphere" doH5g="T" H5Grid="lfmD.h5" icType="user" pdmb="1.0" pFloor="1.0e-8" dFloor="1.0e-6" rmeth="7UP"/>
<restart doRes="F" resFile="XXXXX.h5"/>
<physics doMHD="T" doBoris="T" Ca="10.0"/>
<prob Rho0="0.2" P0="0.001"/>
<ring gid="lfm" doRing="T" Nr="4" Nc1="8" Nc2="16" Nc3="32" Nc4="32"/>
<wind tsfile="bcwind.h5"/>
<source doSource="T"/>
</Gamera>
<!-- Remix params -->
<REMIX>
<grid Np="360" Nt="45" LowLatBoundary="45.0"/>
<conductance pedmin="2.0" hallmin="1.0" sigma_ratio="3.0" const_sigma="True" ped0="5.0"/>
</REMIX>
<!-- EB-Tracer (CHIMP) params -->
<CHIMP>
<units uid="EARTHCODE"/>
<fields grType="LFM"/>
<domain dtype="SPH" rmin="2.0" rmax="25.0"/>
</CHIMP>
</Kaiju>

View File

@@ -42,6 +42,20 @@ date
echo 'REMIX tests complete.'
echo | tail -n 3 ./mixTests.out
echo 'Running RCM tests.'
date
./rcmTests >& rcmTests.out
date
echo 'RCM tests complete.'
echo | tail -n 3 ./rcmTests.out
echo 'Running SHELLGRID tests.'
date
./shgrTests >& shgrTests.out
date
echo 'SHELLGRID tests complete.'
echo | tail -n 3 ./shgrTests.out
echo 'Running VOLTRON tests.'
date
./voltTests >& voltTests.out

View File

@@ -47,6 +47,20 @@ date
echo 'REMIX tests complete.'
echo | tail -n 3 ./mixTests.out
echo 'Running RCM tests.'
date
./rcmTests > rcmTests.out
date
echo 'RCM tests complete.'
echo | tail -n 3 ./rcmTests.out
echo 'Running SHELLGRID tests.'
date
./shgrTests > shgrTests.out
date
echo 'SHELLGRID tests complete.'
echo | tail -n 3 ./shgrTests.out
echo 'Running VOLTRON tests.'
date
./voltTests > voltTests.out

View File

@@ -17,6 +17,7 @@
<prob Rho0="0.1" P0="0.001" rCut="16.0" lCut="8.0"/>
<ring gid="lfm" doRing="T" Nr="3" Nc1="8" Nc2="16" Nc3="32"/>
<wind tsfile="bcwind.h5"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -17,6 +17,7 @@
<prob Rho0="0.1" P0="0.001" rCut="16.0" lCut="8.0"/>
<ring gid="lfm" doRing="T" Nr="3" Nc1="8" Nc2="16" Nc3="32"/>
<wind tsfile="bcwind.h5"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -24,6 +24,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -24,6 +24,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -24,6 +24,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -24,6 +24,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -24,6 +24,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -24,6 +24,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -21,10 +21,10 @@
<ebsquish epsSquish="0.05" />
</VOLTRON>
<Gamera>
<sim H5Grid="lfmD.h5" doH5g="T" icType="user" pdmb="1.0" rmeth="7UP" runid="geo_mpi" />
<sim H5Grid="lfmD.h5" doH5g="T" icType="user" pdmb="1.0" rmeth="7UP" runid="msphereRes" />
<floors dFloor="1.0e-4" pFloor="1.0e-6" />
<timestep doCPR="T" limCPR="0.25" />
<restart doRes="F" nRes="-1" resID="msphere" />
<restart doRes="F" nRes="-1" resID="msphereRes" />
<physics Ca="10.0" doBoris="T" doMHD="T" />
<ring doRing="T" gid="lfm" />
<ringknobs doVClean="T" />

View File

@@ -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="T"/>
<coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="F" doDynDT="F" doAsyncCoupling="F"/>
<restart dtRes="1800.0"/>
<imag doInit="T"/>
<ebsquish epsSquish="0.05"/>
@@ -25,6 +25,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>

View File

@@ -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="T"/>
<coupling dtCouple="5.0" rTrc="40.0" imType="RCM" doQkSquish="F" doDynDT="F" doAsyncCoupling="F"/>
<restart dtRes="1800.0"/>
<imag doInit="T"/>
<ebsquish epsSquish="0.05"/>
@@ -25,6 +25,7 @@
<wind tsfile="bcwind.h5"/>
<source doSource="T" doBounceDT="T"/>
<threading NumTh="18"/>
<coupling blockHalo="T"/>
</Gamera>
<!-- Remix -->
<REMIX>