Changeset 1719

Timestamp:

08/17/09 11:21:26 (16 years ago)

Author:

seroussi

Message:

changed cielo parallel timestep in yrs

Location:

issm/trunk/src/c/parallel

Files:

• prognostic.cpp (modified) (3 diffs)
• thermal.cpp (modified) (3 diffs)
• transient.cpp (modified) (2 diffs)
• transient_core_2d.cpp (modified) (3 diffs)
• transient_core_3d.cpp (modified) (3 diffs)

issm/trunk/src/c/parallel/prognostic.cpp

@@ -35 +35 @@
         double* accumulation_g=NULL;
         double  dt;
+        double  yts;
         int     qmu_analysis;
 
@@ -73 +74 @@
         fem.parameters->FindParam((void*)&accumulation_g,"a_g");
         fem.parameters->FindParam((void*)&dt,"dt");
+        fem.parameters->FindParam((void*)&yts,"yts");
         fem.parameters->FindParam((void*)&numberofnodes,"numberofnodes");
 
@@ -81 +83 @@
         inputs->Add("melting",melting_g,1,numberofnodes);
         inputs->Add("accumulation",accumulation_g,1,numberofnodes);
-        inputs->Add("dt",dt);
+        inputs->Add("dt",dt*yts);
 
         _printf_("initialize results:\n");

issm/trunk/src/c/parallel/thermal.cpp

@@ -41 +41 @@
         Param*           param=NULL;
         double  dt;
+        double  yts;
 
         int    waitonlock=0;
@@ -74 +75 @@
         femmodels[0].parameters->FindParam((void*)&waitonlock,"waitonlock");
         femmodels[0].parameters->FindParam((void*)&dt,"dt");
+        femmodels[0].parameters->FindParam((void*)&yts,"yts");
 
         inputs=new ParameterInputs;
@@ -79 +81 @@
         inputs->Add("velocity",u_g,3,numberofnodes);
         inputs->Add("pressure",p_g,1,numberofnodes);
-        inputs->Add("dt",dt);
+        inputs->Add("dt",dt*yts); //convert in seconds 
 
         _printf_("initialize results:\n");

issm/trunk/src/c/parallel/transient.cpp

@@ -42 +42 @@
         double* a_g=NULL;
         double  dt;
+        double  yts;
         Param*  param=NULL;
 
@@ -101 +102 @@
 
         femmodels[5].parameters->FindParam((void*)&dt,"dt");
-        inputs->Add("dt",dt);
+        femmodels[5].parameters->FindParam((void*)&yts,"yts");
+        inputs->Add("dt",dt*yts);
         
         _printf_("initialize results:\n");

issm/trunk/src/c/parallel/transient_core_2d.cpp

@@ -49 +49 @@
         double finaltime;
         double dt;
-        double yts;
         DataSet* diagnostic_results=NULL;
         DataSet* prognostic_results=NULL;
@@ -76 +75 @@
         fem_dh->parameters->FindParam((void*)&finaltime,"ndt");
         fem_dh->parameters->FindParam((void*)&dt,"dt");
-        fem_dh->parameters->FindParam((void*)&yts,"yts");
         fem_dh->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
 
@@ -108 +106 @@
         while(time<finaltime){ //make sure we run up to finaltime.
         
-                _printf_("%s%g%s%i%s%g\n","time [yr]: ",time/yts,"    iteration number: ",step,"/",floor(finaltime/dt));
+                _printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
 
                 step+=1;

issm/trunk/src/c/parallel/transient_core_3d.cpp

@@ -55 +55 @@
         double finaltime;
         double dt;
-        double yts;
         DataSet* diagnostic_results=NULL;
         DataSet* prognostic_results=NULL;
@@ -85 +84 @@
         fem_dh->parameters->FindParam((void*)&finaltime,"ndt");
         fem_dh->parameters->FindParam((void*)&dt,"dt");
-        fem_dh->parameters->FindParam((void*)&yts,"yts");
         fem_dh->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
 
@@ -124 +122 @@
         while(time<finaltime){ //make sure we run up to finaltime.
         
-                if(debug)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time/yts,"    iteration number: ",step,"/",floor(finaltime/dt));
+                if(debug)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
 
                 step+=1;