AtHeartEngineer/kaiju
1
0
Fork 0
mirror of https://github.com/JHUAPL/kaiju.git synced 2026-01-06 22:04:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Raiju able to use restart with different id than currenr RunID. Turning raijuSA.x back on in cmakelists

Browse Source
This commit is contained in:
Anthony M. Sciola
2025-11-19 15:21:45 -08:00
parent afebfaa3f6
commit 22607a4084
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -195,11 +195,11 @@ add_subdirectory(src/raiju)
add_custom_target(raiju ALL)
# disabling raijuSA.x for now until it is completed
#message("\tAdding executable raijuSA.x")
message("\tAdding executable raijuSA.x")
#add_executable(raijuSA.x src/drivers/raijuSAx.F90 ${RAIJUIC})
#add_executable(raijuSA.x src/drivers/raijuSAx.F90)
#target_link_libraries(raijuSA.x baselib raijulib)
#add_dependencies(raiju raijuSA.x)
add_executable(raijuSA.x src/drivers/raijuSAx.F90)
target_link_libraries(raijuSA.x baselib raijulib)
add_dependencies(raiju raijuSA.x)
message("\tAdding executable raijuOWD.x")
#add_executable(raijuOWD.x src/drivers/raijuOWDx.F90 ${RAIJUIC})

2
src/base/types/raijuTypes.F90
View File

@@ -193,6 +193,8 @@ module raijutypes
!! Whether we initialize state from a restart file
integer :: nResIn = -1
!! Restart number to use for state init (-1 for symlink)
character(len=strLen) :: resId = ""
!! Restart filename id (resID.raiju.Res.xxxxx.h5) to read from
character(len=strLen) :: ResF = ""
!! Restart filename to read from

2
src/drivers/raijuSAx.F90
View File

@@ -59,7 +59,7 @@ program raijuSAx
call raiApp%InitIO(inpXML)
raiApp%State%isFirstCpl = .false.
if (raiApp%Model%isRestart) then
call raiApp%ReadRestart(raiApp%Model%RunID, raiApp%Model%nResIn)
call raiApp%ReadRestart(raiApp%Model%resID, raiApp%Model%nResIn)
raiApp%State%isFirstCpl = .false.
endif

4
src/raiju/raijuStarter.F90
View File

@@ -137,8 +137,8 @@ module raijustarter
else
tmpStr = "/Kaiju/Gamera/restart/resId"
endif
call iXML%Set_Val(tmpResId, trim(tmpStr), Model%RunID)
call genResInFname(Model, Model%ResF, runIdO=tmpResId) ! Determine filename to read from
call iXML%Set_Val(Model%resId, trim(tmpStr), Model%RunID)
call genResInFname(Model, Model%ResF, runIdO=Model%resId) ! Determine filename to read from
endif
!--- Plasmasphere ---!