Draft: Prepare for arrays #24

klausschuch · 2025-03-05T09:41:54Z

No description provided.

Note: This changes the type in Databus `origInfos` from `VectorChannelInfo` to `ChannelInfo`, but the uses of `DatabusGetOutVectorChannelInfo` haven't been updated. That means that this change breaks all components using `DatabusGetOutVectorChannelInfo`.

Previously, only local results were written in Initialize. This resulted in no timing data being written at startTime (i.e. the RTFactor results started at startTime + deltaTime).

…M_TIME

When the step sizes are multiples of one another (sync and coupling), it is possible to use a bigger epsilon (half of the smaller step size) in order to push back the moment when components might fall out of sync due to floating point operation errors.

- do not flip dimensions from the asix file (dim0-major)

src/components/comp_vector_integrator.c

src/core/Databus.c

src/core/SubModel.c

src/core/channels/ChannelValue.c

src/core/connections/FilteredConnection.c

src/core/Databus.c

-                    mcx_log(LOG_ERROR, "Ports: Read port infos: Could not read element specific data of port %zu", i);
-                    return RETURN_ERROR;
-                }
+                mcx_log(LOG_ERROR, "Ports: Read port infos: Could not read element specific data of port %d", i);


To fix the problem, we need to ensure that the format specifier matches the type of the variable i. Since i is of type size_t, the correct format specifier to use is %zu. This change will ensure that the printf function correctly interprets the bits of i as an unsigned long.

Change the format specifier from %d to %zu on line 351.

No additional methods, imports, or definitions are needed.

src/core/Model.c

        mcx_os_fprintf(dotFile, "      <table %s>\n", tableArgs);
        for (j = 0; j < GetDependencyNumIn(A); j++) {
            mcx_os_fprintf(dotFile, "        <tr>\n");
-            mcx_os_fprintf(dotFile, "          <td port=\"in%zu\">%zu</td>\n", j, j);


To fix the problem, we need to ensure that the format specifier matches the type of the argument. Since c->GetID(c) returns an unsigned long, we should use the format specifier %lu which is intended for unsigned long types.

Change the format specifier from %d to %lu on line 1656.

Ensure that the argument passed to the format specifier is indeed of type unsigned long.

src/core/Model.c

                grp = comp->GetInitialOutGroup(comp, j);
            } else {
                grp = comp->GetOutGroup(comp, j);
            }


To fix the problem, we need to ensure that the format specifier matches the type of the argument. Since j is of type unsigned long, we should use the %lu format specifier instead of %d. This change will ensure that the printf function correctly interprets the argument type, preventing undefined behavior.

src/core/Model.c

                grp = comp->GetInitialOutGroup(comp, j);
            } else {
                grp = comp->GetOutGroup(comp, j);
            }


To fix the problem, we need to ensure that the format specifier matches the type of the argument being passed. In this case, the variable j is of type unsigned long, so we should use the %lu format specifier instead of %d. This change will ensure that the mcx_os_fprintf function correctly interprets the argument type and produces the expected output.

src/core/Model.c

To fix the problem, we need to ensure that the format specifier matches the type of the argument being passed. In this case, the argument comps->Size(comps) + 1 is of type unsigned long, so we should use the %lu format specifier instead of %d. This change will ensure that the value is correctly interpreted and printed.

Vaan5 and others added 30 commits March 5, 2025 10:27

Set channel reference for outputs as well

631acec

Define info object for storing variable data from the model description

493d8f6

Construct proxies to array parameters during read

056e751

Only take into account fully tunable maps/curves

5c6e07d

Add ParameterProxies

bd270ab

Component: Distinguish error/warning in DoStep

2d03c7a

results: Make CSV component files resettable

08da9f9

channel: Add return value to SetFromReference

d777f0b

channel: Add return value to SetToReference

6772175

channel: Add CHANNEL_ARRAY

06e7555

Add ChannelTypeMatch

d2e4b57

channel: Use ChannelTypeMatch in ChannelInSetReference

d848a9e

channel: Use ChannelValueDataSetFromReference in ChannelInUpdate

133ae56

channel: Add error messages

d1c5545

channel: Remove unnecessary type checks

92ccb83

channel: Add nameInModel to ChannelInfoInit

36065ec

Add ChannelValueDestroy to free ChannelValues on heap

b43a7e9

channel: Use writeResults as scalar for vectors

56e5bb5

channel: Make ChannelType a struct

75a4c3a

channel: Use ChannelType only via references

ea3030c

storage: Expand arrays to scalars in the csv backend

458edde

channel: Add ChannelTypeBaseType

24cbf75

channel: Add ChannelValueNewScalar

0de5c26

constant: Remove use of VectorChannelInfo

888534e

value: Add array_destroy

e8e1495

vector_integrator: Remove use of VectorChannelInfo

67c0d1b

ChannelValueToString: Support ChannelTypeArray

b790646

channel: Add ChannelTypeArrayInner

d1f3404

fmu: Support ChannelTypeArray

acb52ef

Vaan5 and others added 25 commits March 5, 2025 10:38

Rename ChannelDimensionSetDimension argument

dcd906a

Remove obsolete code

63ffb63

Avoid memory allocations due to C/C++ interface

b9cd4a4

storage: Make utility function accessible to all backends

d6dc19e

storage: Make function ANSI C compliant

6cc43b2

Move variables closer to the place where they are used

d61a172

Update element channels prior to exiting init mode in connections

0c1e5cc

Make additional init step configurable via an environment variable

95302f6

ChannelValue: Return error when failing to allocate memory

2cb5d63

Task: Change default of sumTime to TRUE

1cdbcf4

task/results: Store RTFactor in Task->Initialize

fe56fa4

Previously, only local results were written in Initialize. This resulted in no timing data being written at startTime (i.e. the RTFactor results started at startTime + deltaTime).

util: Convert relative Dll paths to absolute ones

c754c71

util: Use goto cleanup strategy for handling errors

75c167a

util: Log (Debug) absolute path of Dll

c91257f

Calculate first larger sync time multiple differently depending on SU…

cd6d38f

…M_TIME

util: Expose function for absolute epsilon comparison

3afd503

Use same way of checking for sync slots both in component and step type

54456a6

Remove obsolete code

c05f575

Define a leq comparison function using absolute epsilon comparison

0b8f30c

Add const qualifiers

c9bd0be

Add const qualifier

b002c77

FMU2: Correctly use dimensions of naming convention arrays

29458bf

- do not flip dimensions from the asix file (dim0-major)

Correctly check if cloning was successful

53cddb3

fmu: Remove check for valid dimension_1/2

1251484

github-advanced-security bot found potential problems Mar 5, 2025

View reviewed changes

klausschuch changed the base branch from main to catch_signals March 5, 2025 17:43

github-advanced-security bot found potential problems Mar 5, 2025

View reviewed changes

Use %zu for size_t

79a57c0

klausschuch force-pushed the prepare_for_arrays branch from 63c6e9b to 79a57c0 Compare March 5, 2025 17:54

@@ -350,3 +350,3 @@
                         if (RETURN_ERROR == retVal) {
-                            mcx_log(LOG_ERROR, "Ports: Read port infos: Could not read element specific data of port %d", i);
+                            mcx_log(LOG_ERROR, "Ports: Read port infos: Could not read element specific data of port %zu", i);
                             goto cleanup;

@@ -1655,3 +1655,3 @@
                     mcx_os_fprintf(dotFile, "  </tr>\n");
-                    mcx_os_fprintf(dotFile, "</table>>] comp%d;\n", c->GetID(c));
+                    mcx_os_fprintf(dotFile, "</table>>] comp%lu;\n", c->GetID(c));
                 }

@@ -1670,3 +1670,3 @@
                     mcx_os_fprintf(dotFile, "        <tr>\n");
-                    mcx_os_fprintf(dotFile, "          <td port=\"in%d\">%d</td>\n", j, j);
+                    mcx_os_fprintf(dotFile, "          <td port=\"in%lu\">%lu</td>\n", j, j);
                     mcx_os_fprintf(dotFile, "        </tr>\n");

@@ -1670,3 +1670,3 @@
                     mcx_os_fprintf(dotFile, "        <tr>\n");
-                    mcx_os_fprintf(dotFile, "          <td port=\"in%d\">%d</td>\n", j, j);
+                    mcx_os_fprintf(dotFile, "          <td port=\"in%lu\">%lu</td>\n", j, j);
                     mcx_os_fprintf(dotFile, "        </tr>\n");

@@ -1678,3 +1678,3 @@
                     mcx_os_fprintf(dotFile, "  </tr>\n");
-                    mcx_os_fprintf(dotFile, "</table>>] comp%d;\n", comps->Size(comps) + 1);
+                    mcx_os_fprintf(dotFile, "</table>>] comp%lu;\n", comps->Size(comps) + 1);
                 }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Draft: Prepare for arrays #24

Draft: Prepare for arrays #24

Uh oh!

klausschuch commented Mar 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Draft: Prepare for arrays #24

Are you sure you want to change the base?

Draft: Prepare for arrays #24

Uh oh!

Conversation

klausschuch commented Mar 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Check failure

Copilot Autofix

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants