Commit 2c6f82f9 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

rename farset to farcpy

parent eb352620
...@@ -305,23 +305,20 @@ void *XTimstat(void *argument) ...@@ -305,23 +305,20 @@ void *XTimstat(void *argument)
readarg.tsIDnext = tsID; readarg.tsIDnext = tsID;
readarg.nrecs = nrecs; readarg.nrecs = nrecs;
if ( ltsfirst || lparallelread == FALSE ) if ( ltsfirst || lparallelread == FALSE )
{ {
ltsfirst = FALSE;
if ( lparallelread ) if ( lparallelread )
{ {
cdo_task_start(read_task, cdoReadTimestep, &readarg); cdo_task_start(read_task, cdoReadTimestep, &readarg);
readresult = cdo_task_wait(read_task);
} }
else else
{ {
readresult = cdoReadTimestep(&readarg); readresult = cdoReadTimestep(&readarg);
} }
}
if ( lparallelread )
{
readresult = cdo_task_wait(read_task);
}
ltsfirst = FALSE;
}
else else
{ {
readresult = cdo_task_wait(read_task); readresult = cdo_task_wait(read_task);
...@@ -347,7 +344,7 @@ void *XTimstat(void *argument) ...@@ -347,7 +344,7 @@ void *XTimstat(void *argument)
if ( nsets == 0 ) if ( nsets == 0 )
{ {
farset(&vars1[varID][levelID], input_vars[varID][levelID]); farcpy(&vars1[varID][levelID], input_vars[varID][levelID]);
nmiss = input_vars[varID][levelID].nmiss; nmiss = input_vars[varID][levelID].nmiss;
vars1[varID][levelID].nmiss = nmiss; vars1[varID][levelID].nmiss = nmiss;
if ( nmiss > 0 || samp1[varID][levelID].ptr ) if ( nmiss > 0 || samp1[varID][levelID].ptr )
......
...@@ -149,7 +149,7 @@ void farround(field_t *field); ...@@ -149,7 +149,7 @@ void farround(field_t *field);
void farfun(field_t *field1, field_t field2, const int function); void farfun(field_t *field1, field_t field2, const int function);
void farset(field_t *field1, field_t field2); void farcpy(field_t *field1, field_t field2);
void faradd(field_t *field1, field_t field2); void faradd(field_t *field1, field_t field2);
void farsum(field_t *field1, field_t field2); void farsum(field_t *field1, field_t field2);
void farsumw(field_t *field1, field_t field2, double w); void farsumw(field_t *field1, field_t field2, double w);
......
...@@ -41,7 +41,7 @@ void farfun(field_t *field1, field_t field2, const int function) ...@@ -41,7 +41,7 @@ void farfun(field_t *field1, field_t field2, const int function)
} }
void farset(field_t *field1, field_t field2) void farcpy(field_t *field1, field_t field2)
{ {
size_t i, len; size_t i, len;
int nwpv = field1->nwpv; int nwpv = field1->nwpv;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment