Changeset 18454

Timestamp:

08/21/14 09:51:13 (11 years ago)

Author:

abuzzi

Message:

MODIF: final version of the code, untested.

File:

• issm/trunk-jpl/src/m/contrib/gravity/vfsa.cpp (modified) (7 diffs)

issm/trunk-jpl/src/m/contrib/gravity/vfsa.cpp

@@ -300 +300 @@
         Matrix* m_new    = new Matrix(mx *my,3);
         m_old->MatrixEqual(mesh_ini);
-        mesh_ini->Echo();
 
         /* calculate initial misfit */
@@ -310 +309 @@
         savefile2 << totaliter<< endl;
         for(int i=0;i<mx*my;i++){
-        savefile2 << m_old->GetValue(i,0)<<"   "<< m_old->GetValue(i,1)<<"   "<< m_old->GetValue(i,2)<<endl;
-        }
-        
+                savefile2 << m_old->GetValue(i,0)<<"   "<< m_old->GetValue(i,1)<<"   "<< m_old->GetValue(i,2)<<endl;
+        }
+        savefile2 << "111111111111111111111111111111111111111111111111111111111111111111111111111"<< endl;
+
         /* beginning of the loop */
 
         while(finished==0){
-                
+
                 iterT++;
                 totaliter++;
@@ -341 +341 @@
 
                 newmodelgen(m_old,m_new,bathy,icethick,mx,my,Tm,ptval,mmax,mmax2,ctr,sd);  /* new model */
-           E_new=misfit(m_new,evalid,gobs,dlevel,Pobs,xobs,yobs,Pp,rho1,rho2,dx,dy,dn,nx,ny,mx,my); /* new energy */
+                E_new=misfit(m_new,evalid,gobs,dlevel,Pobs,xobs,yobs,Pp,rho1,rho2,dx,dy,dn,nx,ny,mx,my); /* new energy */
                 dE=E_new-E_old;                                        /* energy difference */
 
@@ -369 +369 @@
                                         savefile2 << m_old->GetValue(i,0)<<"   "<< m_old->GetValue(i,1)<<"   "<< m_old->GetValue(i,2)<<endl;
                                 }
+                                savefile2 << "111111111111111111111111111111111111111111111111111111111111111111111111111"<< endl;
                         }
                 }
@@ -383 +384 @@
                                                 savefile2 << m_old->GetValue(i,0)<<"   "<< m_old->GetValue(i,1)<<"   "<< m_old->GetValue(i,2)<<endl;
                                         }
+                                        savefile2 << "111111111111111111111111111111111111111111111111111111111111111111111111111"<< endl;
                                 }
                         }
@@ -398 +400 @@
                 savefile2 << m_min->GetValue(i,0)<<"   "<< m_min->GetValue(i,1)<<"   "<< m_min->GetValue(i,2)<<endl;
         }
+        savefile1.close;
+        savefile2.close;
                         /*}}}*/
         return 0;
@@ -630 +634 @@
         m1->ExtractColumn(m1col,1);
         vec2gridsimple(m1col,m1gr,mx,my);
-        cout<<endl<<endl;
         filtergrav(m1grsm,m1gr,ctr,sd,mx,my);
         reshape(m1grsm,m1col,mx,my);