Changeset 19184

Timestamp:

03/06/15 10:35:09 (10 years ago)

Author:

lemorzad

Message:

temporally removing NR 240. new delta O18 interpolation method

Location:

issm/trunk-jpl

Files:

• src/c/classes/Materials/Matpar.cpp (modified) (5 diffs)
• src/m/classes/clusters/acenet.m (modified) (2 diffs)
• test/Archives/Archive240.nc (deleted)
• test/NightlyRun/test240.m (deleted)

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -55 +55 @@
                                         iomodel->Constant(&this->rlaps,SurfaceforcingsRlapsEnum);
                                         iomodel->Constant(&this->rlapslgm,SurfaceforcingsRlapslgmEnum);
+                                        // iomodel->Constant(&this->dpermil,SurfaceforcingsDpermilEnum);                                        
                                         break;
                                 case SMBgradientsEnum:
@@ -134 +135 @@
         _printf_("   rlaps: " << rlaps << "\n");
         _printf_("   rlapslgm: " << rlapslgm << "\n");
+        //      _printf_("   dpermil: " << dpermil << "\n");
         return;
 }
@@ -179 +181 @@
         matpar->rlaps=this->rlaps;
         matpar->rlapslgm=this->rlapslgm;
+        //      matpar->dpermil=this->dpermil;
 
         matpar->sediment_compressibility=this->sediment_compressibility;
@@ -274 +277 @@
                         this->rlapslgm=constant;
                         break;
+//              case  SurfaceforcingsDpermilEnum:
+//                      this->dpermil=constant;
+//                      break;
                 default: 
                         break;
@@ -400 +406 @@
                 case SurfaceforcingsRlapsEnum:               return this->rlaps;
                 case SurfaceforcingsRlapslgmEnum:            return this->rlapslgm;
+                  //            case SurfaceforcingsDpermilEnum:             return this->dpermil;
                 case MaterialsLithosphereShearModulusEnum:   return this->lithosphere_shear_modulus;
                 case MaterialsLithosphereDensityEnum:        return this->lithosphere_density;

issm/trunk-jpl/src/m/classes/clusters/acenet.m

@@ -74 +74 @@
           % fprintf(fid,'#$ -l h_rt=336:00:0\n');
 
-          fprintf(fid,'#$ -l h_vmem=3.5G\n');
+          fprintf(fid,'#$ -l h_vmem=3G\n');
           % if cluster.np>10
           %     fprintf(fid,'#$ -l h_vmem=3G\n');
@@ -94 +94 @@
   
           % ---- cpus on different nodes ----
-          % fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand
+           fprintf(fid,'#$ -pe ompi %i\n',cluster.np); % To avoid green acenet that does not have InfiniBand
           % fprintf(fid,'#$ -pe ompi* %i\n',cluster.np);
           % -------- All cpus in the same node --------          
-           fprintf(fid,'#$ -pe openmp %i\n',cluster.np);
+          %fprintf(fid,'#$ -pe openmp %i\n',cluster.np);
           
           % ---- misc ----