Changeset 26744 for issm/trunk/src/c/classes/Loads/Channel.cpp

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Loads/Channel.cpp (modified) (2 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean

issm/trunk/src/c/classes/Loads/Channel.cpp

@@ -320 +320 @@
                         switch(set2_enum){
                                 case FsetEnum:
-                                        if(nodes[i]->fsize){
+                                        if(nodes[i]->FSize()){
                                                 if(this->nodes[i]->IsClone())
                                                  o_nz += 1;
@@ -336 +336 @@
                                         break;
                                 case SsetEnum:
-                                        if(nodes[i]->ssize){
+                                        if(nodes[i]->SSize()){
                                                 if(this->nodes[i]->IsClone())
                                                  o_nz += 1;

@@ -20 +20 @@
 issm
 kriging
+issm_slc
 issm_slr
 issm_ocean