diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ade093b..7d6a242f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/src/base/types/raijuTypes.F90 b/src/base/types/raijuTypes.F90 index 358c0cc9..56386870 100644 --- a/src/base/types/raijuTypes.F90 +++ b/src/base/types/raijuTypes.F90 @@ -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 diff --git a/src/drivers/raijuSAx.F90 b/src/drivers/raijuSAx.F90 index 3bf76893..cf41b989 100644 --- a/src/drivers/raijuSAx.F90 +++ b/src/drivers/raijuSAx.F90 @@ -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 diff --git a/src/raiju/raijuStarter.F90 b/src/raiju/raijuStarter.F90 index 36d899c3..601971e7 100644 --- a/src/raiju/raijuStarter.F90 +++ b/src/raiju/raijuStarter.F90 @@ -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 ---!