Context Navigation

← Previous Change
Next Change →

Changeset 26744 for issm/trunk/src/c/solutionsequences/solutionsequences.h

Timestamp:

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

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

Files:

: 4 edited

. (modified) (1 prop)
src (modified) (1 prop)
src/c (modified) (1 prop)
src/c/solutionsequences/solutionsequences.h (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

issm/trunk
- Property svn:mergeinfo changed
  /issm/trunk-jpl merged: 25837-25866,25868-25993,25995-26330,26332-26733,26736-26739,26741

issm/trunk/src

Property svn:mergeinfo changed

/issm/trunk-jpl/src

merged: 25837,25839-25840,25842-25844,25851,25854,25860,25869-25872,25882-25883,25905,25907,25910-25912,25914,25920,25929,25933-25936,25940-25943,25945,25947,25949-25950,25952-25958,25960-25962,25969-25970,25972-25976,25988,25992-25993,25995-26023,26034,26036-26039,26041-26044,26046-26052,26055-26066,26069-26076,26079-26081,26083-26086,26088-26091,26096-26097,26099,26101,26103-26107,26109-26122,26125-26138,26140-26141,26143-26144,26146-26153,26155-26158,26160-26161,26164-26168,26170,26172,26174-26175,26177-26188,26191-26197,26199-26202,26204-26210,26213,26219-26234,26236-26238,26241-26245,26247,26249,26251-26256,26264,26266-26267,26271-26272,26274-26283,26285,26287,26290-26296,26299-26314,26316-26320,26322-26330,26332-26334,26338-26347,26351-26355,26357-26365,26367-26368,26370-26377,26380,26382-26383,26385-26391,26395,26397-26399,26401,26407,26410-26412,26415,26419-26421,26423-26424,26432-26435,26441-26446,26448,26450-26451,26455,26457-26461,26463-26493,26495,26497,26499-26501,26503,26510,26512,26514,26518-26519,26522-26523,26525-26529,26531-26541,26546-26557,26565-26608,26611-26613,26615-26632,26634-26636,26640-26653,26655-26663,26666-26667,26669,26671-26677,26680-26684,26686,26691-26692,26694,26696,26698-26699,26701-26706,26709-26718,26723-26731,26736-26738,26741

issm/trunk/src/c

Property svn:ignore

old	new
20	20	issm
21	21	kriging
	22	issm_slc
22	23	issm_slr
23	24	issm_ocean

issm/trunk/src/c/solutionsequences/solutionsequences.h

-              r24313
+              r26744
 /*
  * solutionsequences.h:
+ * solutionsequences.h:
  */
 …
 void solutionsequence_adjoint_linear(FemModel* femmodel);
 void solutionsequence_schurcg(FemModel* femmodel);
+void solutionsequence_sampling(FemModel* femmodel);
 /*convergence*/

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: