Changeset 22758 for issm/trunk/src/c/analyses/SmbAnalysis.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/SmbAnalysis.cpp (modified) (8 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/analyses/SmbAnalysis.cpp

@@ -21 +21 @@
         
         int    smb_model;
-        bool   isdelta18o,ismungsm,isd18opd;
+        bool   isdelta18o,ismungsm,isd18opd,issetpddfac;
         
         /*Update elements: */
@@ -69 +69 @@
                         iomodel->FetchDataToInput(elements,"md.smb.Tini",SmbTiniEnum);
                         iomodel->FetchDataToInput(elements,"md.smb.Sizeini",SmbSizeiniEnum);
+                        iomodel->FetchDataToInput(elements,"md.smb.aValue",SmbAValueEnum);
+                        iomodel->FetchDataToInput(elements,"md.smb.teValue",SmbTeValueEnum);
                         break;
                 case SMBpddEnum:
@@ -90 +92 @@
                         iomodel->FindConstant(&ismungsm,"md.smb.ismungsm");
                         iomodel->FindConstant(&isd18opd,"md.smb.isd18opd");
+                        iomodel->FindConstant(&issetpddfac,"md.smb.issetpddfac");
                         iomodel->FetchDataToInput(elements,"md.thermal.spctemperature",ThermalSpctemperatureEnum);
                         iomodel->FetchDataToInput(elements,"md.smb.s0p",SmbS0pEnum);
@@ -97 +100 @@
                                 iomodel->FetchDataToInput(elements,"md.smb.precipitations_presentday",SmbPrecipitationsPresentdayEnum);
                         }
-
+                        if(issetpddfac){
+                                iomodel->FetchDataToInput(elements,"md.smb.pddfac_snow",SmbPddfacSnowEnum,-1.);
+                                iomodel->FetchDataToInput(elements,"md.smb.pddfac_ice",SmbPddfacIceEnum,-1.);
+                        }
                         break;
                 case SMBgradientsEnum:
@@ -137 +143 @@
         int     numoutputs;
         char**  requestedoutputs = NULL;
-        bool    isdelta18o,ismungsm,isd18opd,interp;
+        bool    isdelta18o,ismungsm,isd18opd,issetpddfac,interp;
         int     smb_model;
         IssmDouble *temp = NULL;
@@ -155 +161 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.swIdx",SmbSwIdxEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.denIdx",SmbDenIdxEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.outputFreq",SmbOutputFreqEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.cldFrac",SmbCldFracEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.t0wet",SmbT0wetEnum));
@@ -172 +177 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.isturbulentflux",SmbIsturbulentfluxEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.InitDensityScaling",SmbInitDensityScalingEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.ThermoDeltaTScaling",SmbThermoDeltaTScalingEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.adThresh",SmbAdThreshEnum));
                         break;
                 case SMBpddEnum:
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.isdelta18o",SmbIsdelta18oEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.ismungsm",SmbIsmungsmEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.desfac",SmbDesfacEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlaps",SmbRlapsEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlapslgm",SmbRlapslgmEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.issetpddfac",SmbIssetpddfacEnum));
                         iomodel->FindConstant(&isdelta18o,"md.smb.isdelta18o");
                         iomodel->FindConstant(&ismungsm,"md.smb.ismungsm");
@@ -208 +213 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.ismungsm",SmbIsmungsmEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.smb.isd18opd",SmbIsd18opdEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.desfac",SmbDesfacEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlaps",SmbRlapsEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.rlapslgm",SmbRlapslgmEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.smb.issetpddfac",SmbIssetpddfacEnum));
                         iomodel->FindConstant(&ismungsm,"md.smb.ismungsm");
                         iomodel->FindConstant(&isd18opd,"md.smb.isd18opd");
+                        iomodel->FindConstant(&issetpddfac,"md.smb.issetpddfac");
                         if(isd18opd){
+                                parameters->AddObject(iomodel->CopyConstantObject("md.smb.f",SmbFEnum));
+                                parameters->AddObject(iomodel->CopyConstantObject("md.smb.istemperaturescaled",SmbIstemperaturescaledEnum));
                                 iomodel->FetchData(&temp,&N,&M,"md.smb.delta18o"); _assert_(N==2);
                                 parameters->AddObject(new TransientParam(SmbDelta18oEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,"md.smb.delta18o");
-                                
-                                parameters->AddObject(iomodel->CopyConstantObject("md.smb.dpermil",SmbDpermilEnum));
-                           parameters->AddObject(iomodel->CopyConstantObject("md.smb.f",SmbFEnum));
                         }
                         break;

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod