Changeset 21680

Timestamp:

04/18/17 12:25:04 (8 years ago)

Author:

tsantos

Message:

CHG: set 0 to deactivate amr capability. Changes in transient_core to verify this condition.

Location:

issm/trunk-jpl/src

Files:

• c/cores/transient_core.cpp (modified) (1 diff)
• m/classes/trans.js (modified) (1 diff)
• m/classes/transient.m (modified) (2 diffs)
• m/classes/transient.py (modified) (2 diffs)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -176 +176 @@
                 /*Adaptive mesh refinement*/
                 #ifdef _HAVE_NEOPZ_
-                if(save_results) femmodel->WriteMeshInResults();
-                if(step%amr_frequency==0 && time<finaltime) femmodel->ReMesh();//Do not refine the last step
+                if(amr_frequency){
+                        if(save_results) femmodel->WriteMeshInResults();
+                        if(step%amr_frequency==0 && time<finaltime) femmodel->ReMesh();//Do not refine the last step
+                }
                 #endif
         

issm/trunk-jpl/src/m/classes/trans.js

@@ -65 +65 @@
                         checkfield(md,'fieldname','trans.iscoupler','numel',[1],'values',[0 ,1]);
                         checkfield(md,'fieldname','trans.isslr','numel',[1],'values',[0 ,1]);
-                        checkfield(md,'fieldname','trans.amr_frequency','numel',[1],'>=',1,'NaN',1,'Inf',1);
+                        checkfield(md,'fieldname','trans.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1);
                         checkfield(md,'fieldname','trans.requested_outputs','stringrow',1);
                 } // }}}

issm/trunk-jpl/src/m/classes/transient.m

@@ -47 +47 @@
                         self.isoceancoupling = 0;
                         self.iscoupler       = 0;
-                        self.amr_frequency      = 1;
+                        self.amr_frequency      = 0;
 
                         %default output
@@ -99 +99 @@
                         md = checkfield(md,'fieldname','transient.isoceancoupling','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',1,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1);
 
                         if (~strcmp(solution,'TransientSolution') & md.transient.iscoupling==1), 

issm/trunk-jpl/src/m/classes/transient.py

@@ -75 +75 @@
                 self.isslr             = False
                 self.iscoupler         = False
-                self.amr_frequency        = 1
+                self.amr_frequency        = 0
 
                 #default output
@@ -122 +122 @@
                 md = checkfield(md,'fieldname','transient.isoceancoupling','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.iscoupler','numel',[1],'values',[0,1])
-                md = checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',1,'NaN',1,'Inf',1)
+                md = checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1)
                 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1)