Changeset 19392

Timestamp:

06/05/15 05:14:41 (10 years ago)

Author:

cborstad

Message:

BUG: some fixes in case model fields are NaN when collapse is called for a python model

File:

• issm/trunk-jpl/src/m/classes/model.py (modified) (3 diffs)

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

@@ -670 +670 @@
                 if not numpy.isnan(md.inversion.vel_obs).all(): md.inversion.vel_obs=project2d(md,md.inversion.vel_obs,md.mesh.numberoflayers) 
                 if not numpy.isnan(md.inversion.cost_functions_coefficients).all(): md.inversion.cost_functions_coefficients=project2d(md,md.inversion.cost_functions_coefficients,md.mesh.numberoflayers) 
-                if md.inversion.min_parameters.size>1: md.inversion.min_parameters=project2d(md,md.inversion.min_parameters,md.mesh.numberoflayers) 
-                if md.inversion.max_parameters.size>1: md.inversion.max_parameters=project2d(md,md.inversion.max_parameters,md.mesh.numberoflayers) 
+                if isinstance(md.inversion.min_parameters,numpy.ndarray):
+                    if md.inversion.min_parameters.size>1: md.inversion.min_parameters=project2d(md,md.inversion.min_parameters,md.mesh.numberoflayers) 
+                if isinstance(md.inversion.max_parameters,numpy.ndarray):
+                    if md.inversion.max_parameters.size>1: md.inversion.max_parameters=project2d(md,md.inversion.max_parameters,md.mesh.numberoflayers) 
                 if not numpy.isnan(md.surfaceforcings.mass_balance).all():
                         md.surfaceforcings.mass_balance=project2d(md,md.surfaceforcings.mass_balance,md.mesh.numberoflayers) 
@@ -703 +705 @@
                 # Hydrologydc variables
                 if hasattr(md.hydrology,'hydrologydc'):
-                        md.hydrology.spcsediment_head=project2d(md,md.hydrology.spcsediment_head,1)
-                        md.hydrology.mask_eplactive_node=project2d(md,md.hydrology.mask_eplactive_node,1)
-                        md.hydrology.sediment_transmitivity=project2d(md,md.hydrology.sediment_transmitivity,1)
-                        md.hydrology.basal_moulin_input=project2d(md,md.hydrology.basal_moulin_input,1)
-                if md.hydrology.isefficientlayer == 1:
+                    md.hydrology.spcsediment_head=project2d(md,md.hydrology.spcsediment_head,1)
+                    md.hydrology.mask_eplactive_node=project2d(md,md.hydrology.mask_eplactive_node,1)
+                    md.hydrology.sediment_transmitivity=project2d(md,md.hydrology.sediment_transmitivity,1)
+                    md.hydrology.basal_moulin_input=project2d(md,md.hydrology.basal_moulin_input,1)
+                    if md.hydrology.isefficientlayer == 1:
                         md.hydrology.spcepl_head=project2d(md,md.hydrology.spcepl_head,1)
 
@@ -744 +746 @@
                 md.geometry.thickness=project2d(md,md.geometry.thickness,1)
                 md.geometry.base=project2d(md,md.geometry.base,1)
-                md.geometry.bed=project2d(md,md.geometry.bed,1)
+                if isinstance(md.geometry.bed,numpy.ndarray):
+                    md.geometry.bed=project2d(md,md.geometry.bed,1)
                 md.mask.groundedice_levelset=project2d(md,md.mask.groundedice_levelset,1)
                 md.mask.ice_levelset=project2d(md,md.mask.ice_levelset,1)
 
                 #lat long
-                if md.mesh.lat.size==md.mesh.numberofvertices:  md.mesh.lat=project2d(md,md.mesh.lat,1) 
-                if md.mesh.long.size==md.mesh.numberofvertices: md.mesh.long=project2d(md,md.mesh.long,1) 
+                if isinstance(md.mesh.lat,numpy.ndarray):
+                    if md.mesh.lat.size==md.mesh.numberofvertices:  md.mesh.lat=project2d(md,md.mesh.lat,1) 
+                if isinstance(md.mesh.long,numpy.ndarray):
+                    if md.mesh.long.size==md.mesh.numberofvertices: md.mesh.long=project2d(md,md.mesh.long,1) 
 
                 #Initialize with the 2d mesh