AtHeartEngineer/kaiju
1
0
Fork 0
mirror of https://github.com/JHUAPL/kaiju.git synced 2026-01-09 15:17:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Re-adding ability to run without RCM, adjusting tests that were shallow-only before

Browse Source
This commit is contained in:
Jeffrey Garretson
2023-02-13 14:42:53 -07:00
parent 34c0f1892f
commit af88712c27
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/earthcmi/argusD.xml
View File

@@ -6,7 +6,7 @@
<time tFin="36000.0"/>
<output dtOut="60.0" tsOut="100" doTimer="F"/>
<restart dtRes="1800.0"/>
<coupling dtCouple="5.0" rDeep="8.0" imType="SST"/>
<coupling dtCouple="5.0" doDeep="F" rDeep="8.0" imType="SST"/>
<eqmap eqFile="JulySST.h5"/>
</VOLTRON>
<Gamera>

2
examples/earthcmi/cmiD.xml
View File

@@ -6,7 +6,7 @@
<time tFin="36000.0"/>
<output dtOut="60.0" tsOut="100" doTimer="F"/>
<restart dtRes="1800.0"/>
<coupling dt="5.0"/>
<coupling dtCouple="5.0" doDeep="F"/>
</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"/>

2
examples/earthcmi/cmiQ.xml
View File

@@ -6,7 +6,7 @@
<time tFin="36000.0"/>
<output dtOut="60.0" tsOut="100" doTimer="F"/>
<restart dtRes="1800.0"/>
<coupling dt="5.0"/>
<coupling dtCouple="5.0" doDeep="F"/>
</VOLTRON>
<Gamera>
<sim runid="msphere" doH5g="T" H5Grid="lfmQ.h5" icType="user" pdmb="1.0" pFloor="1.0e-8" dFloor="1.0e-6" rmeth="7UP"/>

7
src/gamera/mpi/gamapp_mpi.F90
View File

@@ -140,7 +140,7 @@ module gamapp_mpi
real(rp), dimension(:,:,:), allocatable :: tempX,tempY,tempZ
real(rp) :: tmpDT
character(len=strLen) :: inH5
logical :: doH5g
logical :: doH5g, allLoud
integer, dimension(NDIM) :: dims
integer, dimension(:), allocatable :: gamRestartNumbers
@@ -156,6 +156,9 @@ module gamapp_mpi
call xmlInp%Set_Val(doH5g ,"sim/doH5g" ,.false.)
! debugging flag to make all gamera ranks loud
call xmlInp%Set_Val(allLoud, "output/allLoud", .false.)
if(Grid%NumRi*Grid%NumRj*Grid%NumRk > 1) then
Grid%isTiled = .true.
endif
@@ -317,7 +320,7 @@ module gamapp_mpi
Grid%Ri = rank
! only rank 0 should be loud
if(Grid%Ri==0 .and. Grid%Rj==0 .and. Grid%Rk==0) then
if((Grid%Ri==0 .and. Grid%Rj==0 .and. Grid%Rk==0) .or. allLoud) then
Model%isLoud = .true.
else
Model%isLoud = .false.

7
src/voltron/voltapp.F90
View File

@@ -132,11 +132,8 @@ module voltapp
vApp%TargetDeepDT = vApp%DeepDT
call xmlInp%Set_Val(vApp%rTrc, "coupling/rTrc" , 40.0)
if (vApp%DeepDT>0) then
vApp%doDeep = .true.
else
vApp%doDeep = .false.
endif
!Coupling is unified, so adding a separate XML option to control "deep" parts
call xmlInp%Set_Val(vApp%doDeep, "coupling/doDeep", .true.)
call xmlInp%Set_Val(vApp%doGCM, "coupling/doGCM",.false.)
if (vApp%isEarth) then

2
tests/remix/cmiD.xml
View File

@@ -4,7 +4,7 @@
<voltron>
<sim tFin="677.115987461"/>
<spinup doSpin="F"/>
<coupling dt="5.0"/>
<coupling dtCouple="5.0" doDeep="F"/>
</voltron>
<Gamera>
<iPdir N="1"/>

2
tests/voltron_mpi/cmiD_1.xml
View File

@@ -4,7 +4,7 @@
<voltron>
<sim tFin="677.115987461"/>
<spinup doSpin="F"/>
<coupling dt="5.0" doAsyncCoupling="F"/>
<coupling dtCouple="5.0" doDeep="F" doAsyncCoupling="F"/>
</voltron>
<Gamera>
<iPdir N="1" bcPeriodic="F"/>

2
tests/voltron_mpi/cmiD_4.xml
View File

@@ -4,7 +4,7 @@
<voltron>
<sim tFin="677.115987461"/>
<spinup doSpin="F"/>
<coupling dt="5.0" doAsyncCoupling="F"/>
<coupling dtCouple="5.0" doDeep="F" doAsyncCoupling="F"/>
</voltron>
<Gamera>
<iPdir N="1" bcPeriodic="F"/>

2
tests/voltron_mpi/cmiD_8.xml
View File

@@ -4,7 +4,7 @@
<voltron>
<sim tFin="677.115987461"/>
<spinup doSpin="F"/>
<coupling dt="5.0" doAsyncCoupling="F"/>
<coupling dtCouple="5.0" doDeep="F" doAsyncCoupling="F"/>
</voltron>
<Gamera>
<iPdir N="2" bcPeriodic="F"/>