Changeset 05fec0 for pcp/src

Timestamp:

Apr 21, 2008, 2:19:26 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

08a794b

Parents:

6590194

git-author:

Frederik Heber <heber@…> (04/18/08 16:19:24)

git-committer:

Frederik Heber <heber@…> (04/21/08 14:19:26)

Message:

UpdateIonsU(): included contraint motion

File:

• pcp/src/ions.c (modified) (1 diff)

pcp/src/ions.c

@@ -941 +941 @@
     a = delta_t*0.5/IonMass;                            // (F+F_old)/2m = a and thus: v = (F+F_old)/2m * t = (F + F_old) * a
     for (ia=0; ia < I->I[is].Max_IonsOfType; ia++) {
-      FIon = &I->I[is].FIon[NDIM*ia];
-      FIon_old = &I->I[is].FIon_old[NDIM*ia];
       U = &I->I[is].U[NDIM*ia];
-      if (I->I[is].IMT[ia] == MoveIon)
-                                for (d=0; d<NDIM; d++) {
-                                        U[d] += a * (FIon[d]+FIon_old[d]);
-                                }
+      if (I->I[is].Constraints[ia] != NULL) { // override current resulting R and U if constrained is given
+        fprintf(stderr, "(%i) Setting constrained motion U at step %d on ion (%i,%i)\n", P->Par.me, I->I[is].Constraints[ia]->step, is, ia);
+        if ((I->I[is].Constraints[ia]->step != P->R.OuterStep) && (P->Par.me == 0))
+          fprintf(stderr, "(%i) WARNING: constraint step %d does not match Outerstep %d for ion (%d,%d)\n", P->Par.me, I->I[is].Constraints[ia]->step, P->R.OuterStep, is, ia);
+        for (d=0; d<NDIM; d++)
+          U[d] = I->I[is].Constraints[ia]->U[d];
+        RemoveConstraintItem(&I->I[is],ia); // and remove this first item from the list
+      } else {
+        FIon = &I->I[is].FIon[NDIM*ia];
+        FIon_old = &I->I[is].FIon_old[NDIM*ia];
+        //if (I->I[is].IMT[ia] == MoveIon)
+                        for (d=0; d<NDIM; d++) {
+                                U[d] += a * (FIon[d]+FIon_old[d]);
+                        }
+      }
     }
   }