[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
applications/F90HLA demoF90/TwoLevelController/...
|
From: |
certi-cvs |
|
Subject: |
applications/F90HLA demoF90/TwoLevelController/... |
|
Date: |
Mon, 11 Feb 2008 14:25:07 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Christian Stenzel <approx> 08/02/11 14:25:07
Modified files:
F90HLA/demoF90/TwoLevelController/controllerFederate:
controllerFederate_wTime.f90
controllerFederate_woTime.f90
fedSrvMod.f90
F90HLA/demoF90/TwoLevelController/processFederate: fedSrvMod.f90
processFederate_wTime.f90
processFederate_woTime.f90
F90HLA/libF90HLA13: F90HLA13CERTIWrap.cpp fedSrvMod.f90
rtiSrvMod.f90
Log message:
adjust name conventions
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/TwoLevelController/controllerFederate/controllerFederate_wTime.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/TwoLevelController/controllerFederate/controllerFederate_woTime.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/TwoLevelController/controllerFederate/fedSrvMod.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/TwoLevelController/processFederate/fedSrvMod.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/TwoLevelController/processFederate/processFederate_wTime.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/TwoLevelController/processFederate/processFederate_woTime.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/libF90HLA13/F90HLA13CERTIWrap.cpp?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/libF90HLA13/fedSrvMod.f90?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/libF90HLA13/rtiSrvMod.f90?cvsroot=certi&r1=1.1&r2=1.2
Patches:
Index:
demoF90/TwoLevelController/controllerFederate/controllerFederate_wTime.f90
===================================================================
RCS file:
/sources/certi/applications/F90HLA/demoF90/TwoLevelController/controllerFederate/controllerFederate_wTime.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- demoF90/TwoLevelController/controllerFederate/controllerFederate_wTime.f90
28 Jan 2008 21:44:30 -0000 1.1
+++ demoF90/TwoLevelController/controllerFederate/controllerFederate_wTime.f90
11 Feb 2008 14:25:06 -0000 1.2
@@ -88,7 +88,7 @@
t = t + h
- call updateAttrVals(objID_u, uID, (/ u /), "u", t)
+ call updateAttrVal(objID_u, uID, (/ u /), "u", t)
call timeAdvReq(t)
Index:
demoF90/TwoLevelController/controllerFederate/controllerFederate_woTime.f90
===================================================================
RCS file:
/sources/certi/applications/F90HLA/demoF90/TwoLevelController/controllerFederate/controllerFederate_woTime.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- demoF90/TwoLevelController/controllerFederate/controllerFederate_woTime.f90
28 Jan 2008 21:44:30 -0000 1.1
+++ demoF90/TwoLevelController/controllerFederate/controllerFederate_woTime.f90
11 Feb 2008 14:25:06 -0000 1.2
@@ -81,7 +81,7 @@
u = 0;
end if
- call updateAttrVals(objID_u, uID, (/ u /), "u")
+ call updateAttrVal(objID_u, uID, (/ u /), "u")
do
if (REFLATTRVAL_.eqv..true.) then
Index: demoF90/TwoLevelController/controllerFederate/fedSrvMod.f90
===================================================================
RCS file:
/sources/certi/applications/F90HLA/demoF90/TwoLevelController/controllerFederate/fedSrvMod.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- demoF90/TwoLevelController/controllerFederate/fedSrvMod.f90 28 Jan 2008
21:44:30 -0000 1.1
+++ demoF90/TwoLevelController/controllerFederate/fedSrvMod.f90 11 Feb 2008
14:25:06 -0000 1.2
@@ -57,7 +57,7 @@
end subroutine discoverObjInst
!
! 6.7
- subroutine reflectAttrVals(objHdl, &
+ subroutine reflectAttrVal(objHdl, &
attrHdl, attrVals, lenAttrVals, &
logTime, &
tag, lenTag, &
@@ -84,7 +84,7 @@
err = 0
- end subroutine reflectAttrVals
+ end subroutine reflectAttrVal
!
! time management
!
Index: demoF90/TwoLevelController/processFederate/fedSrvMod.f90
===================================================================
RCS file:
/sources/certi/applications/F90HLA/demoF90/TwoLevelController/processFederate/fedSrvMod.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- demoF90/TwoLevelController/processFederate/fedSrvMod.f90 28 Jan 2008
21:44:31 -0000 1.1
+++ demoF90/TwoLevelController/processFederate/fedSrvMod.f90 11 Feb 2008
14:25:06 -0000 1.2
@@ -59,7 +59,7 @@
end subroutine discoverObjInst
!
! 6.7
- subroutine reflectAttrVals(objHdl, &
+ subroutine reflectAttrVal(objHdl, &
attrHdl, attrVals, lenAttrVals, &
logTime, &
tag, lenTag, &
@@ -85,7 +85,7 @@
err = 0
- end subroutine reflectAttrVals
+ end subroutine reflectAttrVal
!
! time management
!
Index: demoF90/TwoLevelController/processFederate/processFederate_wTime.f90
===================================================================
RCS file:
/sources/certi/applications/F90HLA/demoF90/TwoLevelController/processFederate/processFederate_wTime.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- demoF90/TwoLevelController/processFederate/processFederate_wTime.f90
28 Jan 2008 21:44:31 -0000 1.1
+++ demoF90/TwoLevelController/processFederate/processFederate_wTime.f90
11 Feb 2008 14:25:06 -0000 1.2
@@ -88,7 +88,7 @@
y = y + h*ydot
t = t + h
- call updateAttrVals(objID_u, yID, (/ y /), "y", t)
+ call updateAttrVal(objID_u, yID, (/ y /), "y", t)
call timeAdvReq(t)
Index: demoF90/TwoLevelController/processFederate/processFederate_woTime.f90
===================================================================
RCS file:
/sources/certi/applications/F90HLA/demoF90/TwoLevelController/processFederate/processFederate_woTime.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- demoF90/TwoLevelController/processFederate/processFederate_woTime.f90
28 Jan 2008 21:44:31 -0000 1.1
+++ demoF90/TwoLevelController/processFederate/processFederate_woTime.f90
11 Feb 2008 14:25:06 -0000 1.2
@@ -87,7 +87,7 @@
ydot = (-y + u*k) / T1
y = y + h*ydot
- call updateAttrVals(objID_u, yID, (/ y /), "y")
+ call updateAttrVal(objID_u, yID, (/ y /), "y")
t = t + h
write (*, fmt = "(A,F8.3)") "t= ", t
Index: libF90HLA13/F90HLA13CERTIWrap.cpp
===================================================================
RCS file: /sources/certi/applications/F90HLA/libF90HLA13/F90HLA13CERTIWrap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libF90HLA13/F90HLA13CERTIWrap.cpp 28 Jan 2008 21:44:29 -0000 1.1
+++ libF90HLA13/F90HLA13CERTIWrap.cpp 11 Feb 2008 14:25:07 -0000 1.2
@@ -48,14 +48,14 @@
#define _F90syncPointRegSucceeded fedsrvmod_mp_syncpointregsucceeded_
#define _F90syncPointRegFailed fedsrvmod_mp_syncpointregfailed_
#define _F90announceSyncPoint fedsrvmod_mp_announcesyncpoint_
-#define _F90fedSynchronized fedsrvmod_mp_fedsynchronized_
-#define _F90initFedSave fedsrvmod_mp_initfedsave_
+#define _F90fedSync fedsrvmod_mp_fedsync_
+#define _F90initiateFedSave fedsrvmod_mp_initiatefedsave_
#define _F90fedSaved fedsrvmod_mp_fedsaved_
#define _F90fedNotSaved fedsrvmod_mp_fednotsaved_
#define _F90requestFedResSucceeded fedsrvmod_mp_requestfedressucceeded_
#define _F90requestFedResFailed fedsrvmod_mp_requestfedresfailed_
#define _F90fedResBegun fedsrvmod_mp_fedresbegun_
-#define _F90initFedRes fedsrvmod_mp_initfedres_
+#define _F90initiateFedRes fedsrvmod_mp_initiatefedres_
#define _F90fedRestored fedsrvmod_mp_fedrestored_
#define _F90fedNotRestored fedsrvmod_mp_fednotrestored_
@@ -69,7 +69,7 @@
// object management
#define _F90discoverObjInst fedsrvmod_mp_discoverobjinst_
-#define _F90reflectAttrVals fedsrvmod_mp_reflectattrvals_
+#define _F90reflectAttrVal fedsrvmod_mp_reflectattrval_
#define _F90receiveInteract fedsrvmod_mp_receiveinteract_
#define _F90removeObjInst fedsrvmod_mp_removeobjinst_
#define _F90attrInScope fedsrvmod_mp_attrinscope_
@@ -95,14 +95,14 @@
#define _F90syncPointRegSucceeded __fedsrvmod__syncpointregsucceeded
#define _F90syncPointRegFailed __fedsrvmod__syncpointregfailed
#define _F90announceSyncPoint __fedsrvmod__announcesyncpoint
-#define _F90fedSynchronized __fedsrvmod__fedsynchronized
-#define _F90initFedSave __fedsrvmod__initfedsave
+#define _F90fedSync __fedsrvmod__fedsync
+#define _F90initiateFedSave __fedsrvmod__initiatefedsave
#define _F90fedSaved __fedsrvmod__fedsaved
#define _F90fedNotSaved __fedsrvmod__fednotsaved
#define _F90requestFedResSucceeded __fedsrvmod__requestfedressucceeded
#define _F90requestFedResFailed __fedsrvmod__requestfedresfailed
#define _F90fedResBegun __fedsrvmod__fedresbegun
-#define _F90initFedRes __fedsrvmod__initfedres
+#define _F90initiateFedRes __fedsrvmod__initiatefedres
#define _F90fedRestored __fedsrvmod__fedrestored
#define _F90fedNotRestored __fedsrvmod__fednotrestored
@@ -118,7 +118,7 @@
#define _F90objInstNameResSucceeded __fedsrvmod__objinstnameressucceeded
#define _F90objInstNameResFailed __fedsrvmod__objinstnameresfailed
#define _F90discoverObjInst __fedsrvmod__discoverobjinst
-#define _F90reflectAttrVals __fedsrvmod__reflectattrvals
+#define _F90reflectAttrVal __fedsrvmod__reflectattrval
#define _F90receiveInteract __fedsrvmod__receiveinteract
#define _F90removeObjInst __fedsrvmod__removeobjinst
#define _F90attrInScope __fedsrvmod__attrinscope
@@ -300,10 +300,10 @@
// 4.20
extern void
- fedrestorecomplete1_(int*); // error
+ fedrescomplete1_(int*); // error
extern void
- fedrestorenotcomplete1_(int*); // error
+ fedresnotcomplete1_(int*); // error
/////////////////////////////////////
// declaration management (5) //
@@ -340,13 +340,13 @@
// 6.6
extern void
- updateattrvals7_(const int*, // ObjInstHdl
+ updateattrval7_(const int*, // ObjInstHdl
const int*, const double*, const int*, // AttrValMap
const char*, const int*, //
UserSuppliedTag
int*); // error
extern void
- updateattrvals10_(const int*, // ObjInstHdl
+ updateattrval10_(const int*, // ObjInstHdl
const int*, const double*, const int*, // AttrValMap
const char*, const int*, //
UserSuppliedTag
const double*, // logTime
@@ -430,12 +430,12 @@
// 4.10
extern void
- _F90fedSynchronized(const char*, const int*, // label
+ _F90fedSync(const char*, const int*, // label
int*); // error
// 4.12
extern void
- _F90initFedSave(const char*, const int*, // label
+ _F90initiateFedSave(const char*, const int*, // label
int*); // error
// 4.15
@@ -460,7 +460,7 @@
// 4.19
extern void
- _F90initFedRes(const char*, const int*, // label
+ _F90initiateFedRes(const char*, const int*, // label
const int*, // fedHdl
int*); // error
@@ -486,7 +486,7 @@
// 6.7
extern void
- _F90reflectAttrVals(const int*, // ObjHdl
+ _F90reflectAttrVal(const int*, // ObjHdl
const int*, const double*, const int*, //
AttrHdlValPairSet
const double*, // theTime
const char*, const int*, // theTag
@@ -685,7 +685,7 @@
string theLabel(label);
int lenLabel = theLabel.size();
- _F90fedSynchronized(theLabel.c_str(), &lenLabel, &err);
+ _F90fedSync(theLabel.c_str(), &lenLabel, &err);
switch (err) {
case 0 :
@@ -713,7 +713,7 @@
string theLabel(label);
int lenLabel = theLabel.size();
- _F90initFedSave(theLabel.c_str(), &lenLabel, &err);
+ _F90initiateFedSave(theLabel.c_str(), &lenLabel, &err);
switch (err) {
case 0 :
@@ -876,7 +876,7 @@
int lenLabel = theLabel.size();
int fedHdl = fedHdl2Int(handle);
- _F90initFedRes(theLabel.c_str(), &lenLabel,
+ _F90initiateFedRes(theLabel.c_str(), &lenLabel,
&fedHdl,
&err);
@@ -1050,7 +1050,7 @@
}
int lenAttrValues = lenAttrVals;
- _F90reflectAttrVals(&objHdl,
+ _F90reflectAttrVal(&objHdl,
&attrHdl, attrVals, &lenAttrValues,
&logTime,
tag.c_str(), &lenTag,
@@ -1135,7 +1135,7 @@
}
int lenAttrValues = lenAttrVals;
- _F90reflectAttrVals(&objHdl,
+ _F90reflectAttrVal(&objHdl,
&attrHdl, attrVals, &lenAttrValues,
NULL,
tag.c_str(), &lenTag,
@@ -1680,7 +1680,7 @@
// 4.20
extern void
- fedrestorecomplete1_(int *err) {
+ fedrescomplete1_(int *err) {
try {
RTIAMB -> federateRestoreComplete();
@@ -1700,7 +1700,7 @@
}
extern void
- fedrestorenotcomplete1_(int *err) {
+ fedresnotcomplete1_(int *err) {
try {
RTIAMB -> federateRestoreNotComplete();
@@ -1931,7 +1931,7 @@
// 6.6
extern void
-updateattrvals7_(const int *objHdl,
+updateattrval7_(const int *objHdl,
const int *attrHdl, const double *attrVals, const int
*lenAttrVals,
const char *tag, const int *lenTag,
int *err) {
@@ -1998,7 +1998,7 @@
}
extern void
-updateattrvals10_(const int *objHdl, const int *attrHdl,
+updateattrval10_(const int *objHdl, const int *attrHdl,
const double *attrVals, const int *lenAttrVals,
const char *tag, const int *lenTag,
const double *time,
Index: libF90HLA13/fedSrvMod.f90
===================================================================
RCS file: /sources/certi/applications/F90HLA/libF90HLA13/fedSrvMod.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libF90HLA13/fedSrvMod.f90 28 Jan 2008 21:44:30 -0000 1.1
+++ libF90HLA13/fedSrvMod.f90 11 Feb 2008 14:25:07 -0000 1.2
@@ -103,7 +103,7 @@
end subroutine announceSyncPoint
!
! 4.10
- subroutine fedSynchronized(label, lenLabel, err)
+ subroutine fedSync(label, lenLabel, err)
implicit none
@@ -111,14 +111,14 @@
character (len=lenLabel), intent(in) :: label
integer, intent(inout) :: err
- write(*,*) "fedSynchronized not implemented"
+ write(*,*) "fedSync not implemented"
write(*,*) label
err = 0
- end subroutine fedSynchronized
+ end subroutine fedSync
!
! 4.12
- subroutine initFedSave(label, lenLabel, err)
+ subroutine initiateFedSave(label, lenLabel, err)
implicit none
@@ -126,11 +126,11 @@
character (len=lenLabel), intent(in) :: label
integer, intent(inout) :: err
- write(*,*) "initFedSave not implemented"
+ write(*,*) "initiateFedSave not implemented"
write(*,*) label
err = 0
- end subroutine initFedSave
+ end subroutine initiateFedSave
!
! 4.15
subroutine fedSaved(err)
@@ -203,7 +203,7 @@
end subroutine fedResBegun
!
! 4.19
- subroutine initFedRes(label, lenLabel, &
+ subroutine initiateFedRes(label, lenLabel, &
fedHdl, &
err)
@@ -214,11 +214,11 @@
integer, intent(in) :: fedHdl
integer, intent(inout) :: err
- write(*,*) "initFedRes not implemented"
+ write(*,*) "initiateFedRes not implemented"
write(*,*) label
err = 0
- end subroutine initFedRes
+ end subroutine initiateFedRes
!
! 4.21
subroutine fedRestored(err)
@@ -266,7 +266,7 @@
end subroutine discoverObjInst
!
! 6.7
- subroutine reflectAttrVals(objHdl, &
+ subroutine reflectAttrVal(objHdl, &
attrHdl, attrVals, lenAttrVals, &
logTime, &
tag, lenTag, &
@@ -287,7 +287,7 @@
integer, intent(in), optional :: eventRetrHdlSendingFed
integer, intent(inout) :: err
- write(*,*) "reflectAttrVals not implemented"
+ write(*,*) "reflectAttrVal not implemented"
write(*,*) objHdl
write(*,*) attrHdl
write(*,*) attrVals(:)
@@ -295,7 +295,7 @@
err = 0
- end subroutine reflectAttrVals
+ end subroutine reflectAttrVal
!
! time management
!
Index: libF90HLA13/rtiSrvMod.f90
===================================================================
RCS file: /sources/certi/applications/F90HLA/libF90HLA13/rtiSrvMod.f90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libF90HLA13/rtiSrvMod.f90 28 Jan 2008 21:44:29 -0000 1.1
+++ libF90HLA13/rtiSrvMod.f90 11 Feb 2008 14:25:07 -0000 1.2
@@ -353,14 +353,14 @@
!
!
! 4.20
- subroutine fedRestoreComplete(err)
+ subroutine fedResComplete(err)
implicit none
integer, intent(out), optional :: err
integer :: wrapErr = 0
- call fedRestoreComplete1(wrapErr)
+ call fedResComplete1(wrapErr)
if (present(err)) then
err = wrapErr
@@ -371,11 +371,11 @@
end if
end if
- end subroutine fedRestoreComplete
+ end subroutine fedResComplete
!
!
! 4.20
- subroutine fedRestoreNotComplete(err)
+ subroutine fedResNotComplete(err)
implicit none
@@ -383,7 +383,7 @@
integer :: wrapErr = 0
- call fedRestoreNotComplete1(wrapErr)
+ call fedResNotComplete1(wrapErr)
if (present(err)) then
err = wrapErr
@@ -394,7 +394,7 @@
end if
end if
- end subroutine fedRestoreNotComplete
+ end subroutine fedResNotComplete
!
!
! 5. Declaration Management
@@ -484,7 +484,7 @@
!
!
! 6.6
- subroutine updateAttrVals(objHdl, attrHdl, attrVals, tag, &
+ subroutine updateAttrVal(objHdl, attrHdl, attrVals, tag, &
logTime, ret1, ret2, err)
implicit none
@@ -509,11 +509,11 @@
! write(*,*) logTime
if (present(logTime)) then
- call updateAttrVals10(objHdl, attrHdl, attrVals, size(attrVals), &
+ call updateAttrVal10(objHdl, attrHdl, attrVals, size(attrVals), &
tag, len(tag), logTime, &
wrapRet1, wrapRet2, wrapErr)
else
- call updateAttrVals7(objHdl, attrHdl, attrVals, size(attrVals), &
+ call updateAttrVal7(objHdl, attrHdl, attrVals, size(attrVals), &
tag, len(tag), wrapErr)
end if
@@ -534,7 +534,7 @@
end if
end if
- end subroutine updateAttrVals
+ end subroutine updateAttrVal
!
!
! 8. Time Management
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- applications/F90HLA demoF90/TwoLevelController/...,
certi-cvs <=