Skip to content

Commit beef483

Browse files
MyoldmoparMyoldmopar
committed
Major update to transition source, probably needs more work, but seems to work OK right now
1 parent 5e8d915 commit beef483

82 files changed

Lines changed: 571 additions & 415 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Transition/CMakeLists.txt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products"
55
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" )
66

77
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
8-
configure_file( CreateNewIDFUsingRulesV8_2_0.in.f90 "${CMAKE_CURRENT_BINARY_DIR}/CreateNewIDFUsingRulesV8_2_0.f90" )
9-
configure_file( IDDAssignV8_2_0.in.f90 "${CMAKE_CURRENT_BINARY_DIR}/IDDAssignV8_2_0.f90" )
10-
configure_file( CreateNewIDFUsingRulesV8_3_0.in.f90 "${CMAKE_CURRENT_BINARY_DIR}/CreateNewIDFUsingRulesV8_3_0.f90" )
11-
configure_file( IDDAssignV8_3_0.in.f90 "${CMAKE_CURRENT_BINARY_DIR}/IDDAssignV8_3_0.f90" )
8+
#configure_file( CreateNewIDFUsingRulesV8_3_0.in.f90 "${CMAKE_CURRENT_BINARY_DIR}/CreateNewIDFUsingRulesV8_3_0.f90" )
9+
#configure_file( IDDAssignV8_3_0.in.f90 "${CMAKE_CURRENT_BINARY_DIR}/IDDAssignV8_3_0.f90" )
1210

1311
# first create a static library of shared stuff
1412
SET(LIB_SRC
@@ -26,11 +24,6 @@ SET(LIB_SRC
2624
)
2725
add_library( TransitionLib STATIC ${LIB_SRC} )
2826

29-
# then create all the binaries using just the Transition source that brings in other files
30-
SET(SRC
31-
Transition.f90
32-
)
33-
3427
list( APPEND VERSIONS 1_0_0 )
3528
list( APPEND VERSIONS 1_0_1 )
3629
list( APPEND VERSIONS 1_0_2 )
@@ -87,6 +80,12 @@ math(EXPR ii "${i} - 1")
8780
LIST(GET VERSIONS ${ii} OLD_VERSION)
8881
LIST(GET VERSIONS ${i} NEW_VERSION)
8982

83+
# then create all the binaries using just the Transition source and the appropriate version of the main sub
84+
SET(SRC
85+
Transition.f90
86+
CreateNewIDFUsingRulesV${NEW_VERSION}.f90
87+
)
88+
9089
STRING( REPLACE _ - OLD-VERSION ${OLD_VERSION} )
9190
STRING( REPLACE _ - NEW-VERSION ${NEW_VERSION} )
9291

@@ -96,8 +95,8 @@ SET(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${LAST_NAME} )
9695
ADD_EXECUTABLE( "${LAST_NAME}" ${SRC} )
9796
TARGET_LINK_LIBRARIES( "${LAST_NAME}" TransitionLib )
9897

99-
SET_PROPERTY( TARGET "${LAST_NAME}"
100-
PROPERTY COMPILE_DEFINITIONS V${NEW_VERSION} )
98+
#SET_PROPERTY( TARGET "${LAST_NAME}"
99+
# PROPERTY COMPILE_DEFINITIONS "V${NEW_VERSION}" )
101100

102101
ENDFOREACH()
103102

‎src/Transition/CreateNewIDFUsingRulesV1_0_1.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_0_1(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.0 => 1.0.1'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-0-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-1-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-0-0-023 to 1-0-1.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -1475,5 +1494,5 @@
14751494

14761495
RETURN
14771496

1478-
!END SUBROUTINE CreateNewIDFUsingRulesV1_0_1
1497+
END SUBROUTINE CreateNewIDFUsingRules
14791498

‎src/Transition/CreateNewIDFUsingRulesV1_0_2.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_0_2(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.0.1 => 1.0.2'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-1-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-2-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-0-1-042 to 1-0-2.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -788,4 +807,4 @@
788807

789808
RETURN
790809

791-
!END SUBROUTINE CreateNewIDFUsingRulesV1_0_2
810+
END SUBROUTINE CreateNewIDFUsingRules

‎src/Transition/CreateNewIDFUsingRulesV1_0_3.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_0_3(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.0.2 => 1.0.3'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-2-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-3-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-0-2-008 to 1-0-3.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -815,5 +834,5 @@
815834

816835
RETURN
817836

818-
!END SUBROUTINE CreateNewIDFUsingRulesV1_0_3
837+
END SUBROUTINE CreateNewIDFUsingRules
819838

‎src/Transition/CreateNewIDFUsingRulesV1_1_0.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_1_0(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.0.3 => 1.1'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-0-3-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-1-0-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-0-3-019 to 1-1-0.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -887,4 +906,4 @@
887906

888907
RETURN
889908

890-
!END SUBROUTINE CreateNewIDFUsingRulesV1_1_0
909+
END SUBROUTINE CreateNewIDFUsingRules

‎src/Transition/CreateNewIDFUsingRulesV1_1_1.f90‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_1_1(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.1 => 1.1.1'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-1-0-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-1-1-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-1-0-020 to 1-1-1.csv'
16+
END SUBROUTINE
17+
18+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
219
! SUBROUTINE INFORMATION:
320
! AUTHOR Linda Lawrie
421
! DATE WRITTEN July 2002
@@ -869,4 +886,4 @@
869886

870887
RETURN
871888

872-
!END SUBROUTINE CreateNewIDFUsingRulesV1_1_1
889+
END SUBROUTINE CreateNewIDFUsingRules

‎src/Transition/CreateNewIDFUsingRulesV1_2_0.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_2_0(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.1.1 => 1.2'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-1-1-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-0-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-1-1-012 to 1-2-0.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322

423
! SUBROUTINE INFORMATION:
@@ -740,4 +759,4 @@
740759

741760
RETURN
742761

743-
!END SUBROUTINE CreateNewIDFUsingRulesV1_2_0
762+
END SUBROUTINE CreateNewIDFUsingRules

‎src/Transition/CreateNewIDFUsingRulesV1_2_1.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_2_1(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.2 => 1.2.1'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-0-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-1-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-2-0-029 to 1-2-1.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -664,4 +683,4 @@
664683

665684
RETURN
666685

667-
!END SUBROUTINE CreateNewIDFUsingRulesV1_2_1
686+
END SUBROUTINE CreateNewIDFUsingRules

‎src/Transition/CreateNewIDFUsingRulesV1_2_2.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_2_2(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.2.1 => 1.2.2'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-1-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-2-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-2-1-012 to 1-2-2.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -695,4 +714,4 @@
695714

696715
RETURN
697716

698-
!END SUBROUTINE CreateNewIDFUsingRulesV1_2_2
717+
END SUBROUTINE CreateNewIDFUsingRules

‎src/Transition/CreateNewIDFUsingRulesV1_2_3.f90‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
!SUBROUTINE CreateNewIDFUsingRulesV1_2_3(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
1+
MODULE SetVersion
2+
3+
USE DataStringGlobals
4+
USE DataVCompareGlobals
5+
6+
PUBLIC
7+
8+
CONTAINS
9+
10+
SUBROUTINE SetThisVersionVariables()
11+
VerString='Conversion 1.2.2 => 1.2.3'
12+
VersionNum=1.0
13+
IDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-2-Energy+.idd'
14+
NewIDDFileNameWithPath=TRIM(ProgramPath)//'V1-2-3-Energy+.idd'
15+
RepVarFileNameWithPath=TRIM(ProgramPath)//'Report Variables 1-2-2-030 to 1-2-3.csv'
16+
END SUBROUTINE
17+
18+
END MODULE
19+
20+
SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFileName,ArgFile,ArgIDFExtension)
221

322
! SUBROUTINE INFORMATION:
423
! AUTHOR Linda Lawrie
@@ -820,4 +839,4 @@
820839

821840
RETURN
822841

823-
!END SUBROUTINE CreateNewIDFUsingRulesV1_2_3
842+
END SUBROUTINE CreateNewIDFUsingRules

0 commit comments

Comments
 (0)